Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
[fw/altos] / src / lpc / ao_arch_funcs.h
index 3cd873ec89c3017a4364fbd063935e4d094be012..0454b38b012e71f80d1dae78928dbe549579229e 100644 (file)
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
 #ifndef _AO_ARCH_FUNCS_H_
 #define _AO_ARCH_FUNCS_H_
 
-#define ao_spi_get_bit(reg,bit,pin,bus,speed) ao_spi_get_mask(reg,(1<<bit),bus,speed)
-#define ao_spi_put_bit(reg,bit,pin,bus) ao_spi_put_mask(reg,(1<<bit),bus)
+#define ao_spi_get_bit(reg,bit,bus,speed) ao_spi_get_mask(reg,(1<<bit),bus,speed)
+#define ao_spi_put_bit(reg,bit,bus) ao_spi_put_mask(reg,(1<<bit),bus)
 
 #define ao_enable_port(port) (lpc_scb.sysahbclkctrl |= (1 << LPC_SCB_SYSAHBCLKCTRL_GPIO))
+#define ao_disable_port(port) (lpc_scb.sysahbclkctrl &= ~(1 << LPC_SCB_SYSAHBCLKCTRL_GPIO))
 
 #define lpc_all_bit(port,bit)  (((port) << 5) | (bit))
 
-#define ao_gpio_set(port, bit, pin, v) (lpc_gpio.byte[lpc_all_bit(port,bit)] = v)
+#define ao_gpio_set(port, bit, v)      (lpc_gpio.byte[lpc_all_bit(port,bit)] = (v))
 
-#define ao_gpio_get(port, bit, pin)    (lpc_gpio_byte[lpc_all_bit(port,bit)])
+#define ao_gpio_get(port, bit)         (lpc_gpio.byte[lpc_all_bit(port,bit)])
 
-#define ao_enable_output(port,bit,pin,v) do {                  \
+#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,v) do {                      \
                ao_enable_port(port);                           \
-               ao_gpio_set(port, bit, pin, v);                 \
+               lpc_set_gpio(port,bit);                         \
+               ao_gpio_set(port, bit, v);                      \
                lpc_gpio.dir[port] |= (1 << bit);               \
        } while (0)
 
-#define ao_enable_input(port,bit,mode) do {                            \
+#define ao_gpio_set_mode(port,bit,mode) do {                           \
                vuint32_t *_ioconf = &lpc_ioconf.pio0_0 + ((port)*24+(bit)); \
                vuint32_t _mode;                                        \
-               ao_enable_port(port);                                   \
-               lpc_gpio.dir[port] &= ~(1 << bit);                      \
                if (mode == AO_EXTI_MODE_PULL_UP)                       \
                        _mode = LPC_IOCONF_MODE_PULL_UP << LPC_IOCONF_MODE; \
                else if (mode == AO_EXTI_MODE_PULL_DOWN)                \
                            (1 << LPC_IOCONF_ADMODE));                  \
        } while (0)
 
-#define ao_enable_analog(port,bit) do {                                        \
-               vuint32_t *_ioconf = &lpc_ioconf.pio0_0 + ((port)*24+(bit)); \
+#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)
+
+#define lpc_token_paster_2(x,y)                x ## y
+#define lpc_token_evaluator_2(x,y)     lpc_token_paster_2(x,y)
+#define lpc_token_paster_3(x,y,z)      x ## y ## z
+#define lpc_token_evaluator_3(x,y,z)   lpc_token_paster_3(x,y,z)
+#define lpc_token_paster_4(w,x,y,z)    w ## x ## y ## z
+#define lpc_token_evaluator_4(w,x,y,z) lpc_token_paster_4(w,x,y,z)
+#define analog_reg(port,bit)           lpc_token_evaluator_4(pio,port,_,bit)
+#define analog_func(id)                        lpc_token_evaluator_2(LPC_IOCONF_FUNC_AD,id)
+
+#define ao_enable_analog(port,bit,id) do {                             \
                ao_enable_port(port);                                   \
                lpc_gpio.dir[port] &= ~(1 << bit);                      \
-               *_ioconf = *_ioconf & ~((1 << LPC_IOCONF_ADMODE) |      \
-                                       (LPC_IOCONF_MODE_MASK << LPC_IOCONF_MODE)); \
+               lpc_ioconf.analog_reg(port,bit) = ((analog_func(id) << LPC_IOCONF_FUNC) | \
+                                                  (0 << LPC_IOCONF_ADMODE)); \
        } while (0)
        
 #define ARM_PUSH32(stack, val) (*(--(stack)) = (val))
@@ -79,10 +105,11 @@ ao_arch_memory_barrier() {
        asm volatile("" ::: "memory");
 }
 
+#if HAS_TASK
 static inline void
 ao_arch_init_stack(struct ao_task *task, void *start)
 {
-       uint32_t        *sp = (uint32_t *) (task->stack + AO_STACK_SIZE);
+       uint32_t        *sp = (uint32_t *) (void *) (task->stack + AO_STACK_SIZE);
        uint32_t        a = (uint32_t) start;
        int             i;
 
@@ -145,16 +172,19 @@ static inline void ao_arch_restore_stack(void) {
 
 #define ao_arch_isr_stack()
 
-#define ao_arch_wait_interrupt() do {                  \
-               asm(".global ao_idle_loc\n\twfi\nao_idle_loc:");        \
-               ao_arch_release_interrupts();                           \
-               ao_arch_block_interrupts();                             \
-       } while (0)
+#endif /* HAS_TASK */
 
-#define ao_arch_critical(b) do {                               \
-               ao_arch_block_interrupts();                     \
-               do { b } while (0);                             \
+#define ao_arch_wait_interrupt() do {                          \
+               asm("\twfi\n");                                 \
                ao_arch_release_interrupts();                   \
+               asm(".global ao_idle_loc\n\nao_idle_loc:");     \
+               ao_arch_block_interrupts();                     \
+       } while (0)
+
+#define ao_arch_critical(b) do {                       \
+               uint32_t __mask = ao_arch_irqsave();    \
+               do { b } while (0);                     \
+               ao_arch_irqrestore(__mask);             \
        } while (0)
 
 /*
@@ -174,8 +204,8 @@ static inline void ao_arch_restore_stack(void) {
                ao_spi_put(bus);                \
        } while (0)
 
-#define ao_spi_get_bit(reg,bit,pin,bus,speed) ao_spi_get_mask(reg,(1<<bit),bus,speed)
-#define ao_spi_put_bit(reg,bit,pin,bus) ao_spi_put_mask(reg,(1<<bit),bus)
+#define ao_spi_get_bit(reg,bit,bus,speed) ao_spi_get_mask(reg,(1<<bit),bus,speed)
+#define ao_spi_put_bit(reg,bit,bus) ao_spi_put_mask(reg,(1<<bit),bus)
 
 void
 ao_spi_get(uint8_t spi_index, uint32_t speed);
@@ -184,7 +214,7 @@ void
 ao_spi_put(uint8_t spi_index);
 
 void
-ao_spi_send(void *block, uint16_t len, uint8_t spi_index);
+ao_spi_send(const void *block, uint16_t len, uint8_t spi_index);
 
 void
 ao_spi_send_fixed(uint8_t value, uint16_t len, uint8_t spi_index);
@@ -193,18 +223,38 @@ void
 ao_spi_recv(void *block, uint16_t len, uint8_t spi_index);
 
 void
-ao_spi_duplex(void *out, void *in, uint16_t len, uint8_t spi_index);
-
-extern uint16_t        ao_spi_speed[LPC_NUM_SPI];
+ao_spi_duplex(const void *out, void *in, uint16_t len, uint8_t spi_index);
 
 void
 ao_spi_init(void);
 
+static inline void
+ao_spi_send_sync(const void *block, uint16_t len, uint8_t spi_index)
+{
+       ao_spi_send(block, len, spi_index);
+}
+
+static inline void ao_spi_send_byte(uint8_t byte, uint8_t spi_index)
+{
+       struct lpc_ssp  *lpc_ssp;
+       switch (spi_index) {
+       case 0:
+               lpc_ssp = &lpc_ssp0;
+               break;
+       case 1:
+               lpc_ssp = &lpc_ssp1;
+               break;
+       }
+       lpc_ssp->dr = byte;
+       while ((lpc_ssp->sr & (1 << LPC_SSP_SR_RNE)) == 0);
+       (void) lpc_ssp->dr;
+}
+
 #define ao_spi_init_cs(port, mask) do {                                        \
                uint8_t __bit__;                                        \
                for (__bit__ = 0; __bit__ < 32; __bit__++) {            \
                        if (mask & (1 << __bit__))                      \
-                               ao_enable_output(port, __bit__, PIN, 1); \
+                               ao_enable_output(port, __bit__, 1); \
                }                                                       \
        } while (0)
 
@@ -219,6 +269,7 @@ static inline void ao_arch_start_scheduler(void) {
        asm("mrs %0,control" : "=&r" (control));
        control |= (1 << 1);
        asm("msr control,%0" : : "r" (control));
+       asm("isb");
 }
 
 #endif /* _AO_ARCH_FUNCS_H_ */