X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Flpc%2Fao_arch_funcs.h;h=b963d3ab72a72c0b6c7c824c7cf8231c7e6257b6;hb=ac1a58af4d281a9bc3572dc503982a94e439a4c1;hp=ff8a184d28198252bbff6787456d9cb9491f9fee;hpb=58db263cc835be0abb972654c2d7369718c88b37;p=fw%2Faltos

diff --git a/src/lpc/ao_arch_funcs.h b/src/lpc/ao_arch_funcs.h
index ff8a184d..b963d3ab 100644
--- a/src/lpc/ao_arch_funcs.h
+++ b/src/lpc/ao_arch_funcs.h
@@ -30,8 +30,19 @@
 
 #define ao_gpio_get(port, bit, pin) 	(lpc_gpio.byte[lpc_all_bit(port,bit)])
 
+#define PORT0_JTAG_REGS	((1 << 11) | (1 << 12) | (1 << 14))
+
+static inline void lpc_set_gpio(int port, int bit) {
+	if (port == 0 && (1 << bit) & (PORT0_JTAG_REGS)) {
+		vuint32_t *_ioconf = &lpc_ioconf.pio0_0 + ((port)*24+(bit));
+
+		*_ioconf = (*_ioconf & ~LPC_IOCONF_FUNC_MASK) | LPC_IOCONF_FUNC_PIO0_11;
+	}
+}
+
 #define ao_enable_output(port,bit,pin,v) do {			\
 		ao_enable_port(port);				\
+		lpc_set_gpio(port,bit);				\
 		ao_gpio_set(port, bit, pin, v);			\
 		lpc_gpio.dir[port] |= (1 << bit);		\
 	} while (0)
@@ -52,6 +63,7 @@
 
 #define ao_enable_input(port,bit,mode) do {				\
 		ao_enable_port(port);					\
+		lpc_set_gpio(port,bit);					\
 		lpc_gpio.dir[port] &= ~(1 << bit);			\
 		ao_gpio_set_mode(port,bit,mode);			\
 	} while (0)
@@ -212,8 +224,6 @@ ao_spi_recv(void *block, uint16_t len, uint8_t spi_index);
 void
 ao_spi_duplex(const void *out, void *in, uint16_t len, uint8_t spi_index);
 
-extern uint16_t	ao_spi_speed[LPC_NUM_SPI];
-
 void
 ao_spi_init(void);
 
@@ -239,4 +249,10 @@ static inline void ao_arch_start_scheduler(void) {
 	asm("isb");
 }
 
+void *
+ao_usb_alloc(uint16_t len);
+
+void
+ao_usb_write(void *block, int len);
+
 #endif /* _AO_ARCH_FUNCS_H_ */