cc1111: Wait for internal flash write to complete
[fw/altos] / src / cc1111 / ao_spi.c
index 1bf5e1551b0c7a9013c009880f3326e875e3dfe4..fb08f3f5311332226901aaf71a6f2801813e22a4 100644 (file)
 
 #include "ao.h"
 
+/* Default pin usage for existing Altus Metrum devices */
+
+#ifndef SPI_CONST
+#define SPI_CONST      0xff
+#endif
+
+/*
+ * USART0 SPI config alt 1
+ * 
+ *     MO      P0_3
+ *     MI      P0_2
+ *     CLK     P0_5
+ *     SS      P0_4
+ *
+ * USART0 SPI config alt 2
+ *
+ *     MO      P1_5
+ *     MI      P1_4
+ *     CLK     P1_3
+ *     CSS     P1_2
+ *
+ * USART1 SPI config alt 1
+ *
+ *     MO      P0_4
+ *     MI      P0_5
+ *     CLK     P0_3
+ *     SS      P0_2
+ *
+ * USART1 SPI config alt 2
+ *
+ *     MO      P1_6
+ *     MI      P1_7
+ *     CLK     P1_5
+ *     SS      P1_4
+ *
+ *
+ * Chip select is the responsibility of the caller in master mode
+ */
+
+#if HAS_SPI_0
+#define SPI_BUF_0      &U0DBUFXADDR
+#define SPI_CSR_0      U0CSR
+#define SPI_BAUD_0     U0BAUD
+#define SPI_GCR_0      U0GCR
+#define SPI_CFG_MASK_0 PERCFG_U0CFG_ALT_MASK
+#define SPI_DMA_TX_0   DMA_CFG0_TRIGGER_UTX0
+#define SPI_DMA_RX_0   DMA_CFG0_TRIGGER_URX0
+
+#if SPI_0_ALT_1
+#define SPI_CFG_0      PERCFG_U0CFG_ALT_1
+#define SPI_SEL_0      P0SEL
+#define SPI_BITS_0     (1 << 3) | (1 << 2) | (1 << 5)
+#define SPI_CSS_BIT_0  (1 << 4)
+#endif
+
+#if SPI_0_ALT_2
+#define SPI_CFG_0      PERCFG_U0CFG_ALT_2
+#define SPI_SEL_0      P1SEL
+#define SPI_PRI_0      P2SEL_PRI3P1_USART0
+#define SPI_BITS_0     (1 << 5) | (1 << 4) | (1 << 3)
+#define SPI_CSS_BIT_0  (1 << 2)
+#endif
+
+#endif
+
+#if HAS_SPI_1
+#define SPI_BUF_1      &U1DBUFXADDR
+#define SPI_CSR_1      U1CSR
+#define SPI_BAUD_1     U1BAUD
+#define SPI_GCR_1      U1GCR
+#define SPI_CFG_MASK_1 PERCFG_U1CFG_ALT_MASK
+#define SPI_DMA_TX_1   DMA_CFG0_TRIGGER_UTX1
+#define SPI_DMA_RX_1   DMA_CFG0_TRIGGER_URX1
+
+#if SPI_1_ALT_1
+#define SPI_CFG_1      PERCFG_U1CFG_ALT_1
+#define SPI_SEL_1      P0SEL
+#define SPI_BITS_1     (1 << 4) | (1 << 5) | (1 << 3)
+#define SPI_CSS_BIT_1  (1 << 2)
+#endif
+
+#if SPI_1_ALT_2
+#define SPI_CFG_1      PERCFG_U1CFG_ALT_2
+#define SPI_SEL_1      P1SEL
+#define SPI_PRI_1      P2SEL_PRI3P1_USART1
+#define SPI_BITS_1     (1 << 6) | (1 << 7) | (1 << 5)
+#define SPI_CSS_BIT_1  (1 << 4)
+#endif
+
+#endif
+
+#if MULTI_SPI
+
+#define SPI_BUF(bus)           ((bus) ? SPI_BUF_1 : SPI_BUF_0)
+#define SPI_CSR(bus)           ((bus) ? SPI_CSR_1 : SPI_CSR_0)
+#define SPI_BAUD(bus)          ((bus) ? SPI_BAUD_1 : SPI_BAUD_0)
+#define SPI_GCR(bus)           ((bus) ? SPI_GCR_1 : SPI_GCR_0)
+#define SPI_CFG_MASK(bus)      ((bus) ? SPI_CFG_MASK_1 : SPI_CFG_MASK_0)
+#define SPI_DMA_TX(bus)                ((bus) ? SPI_DMA_TX_1 : SPI_DMA_TX_0)
+#define SPI_DMA_RX(bus)                ((bus) ? SPI_DMA_RX_1 : SPI_DMA_RX_0)
+#define SPI_CFG(bus)           ((bus) ? SPI_CFG_1 : SPI_CFG_0)
+#define SPI_SEL(bus)           ((bus) ? SPI_SEL_1 : SPI_SEL_0)
+#define SPI_BITS(bus)          ((bus) ? SPI_BITS_1 : SPI_BITS_0)
+#define SPI_CSS_BIT(bus)       ((bus) ? SPI_CSS_BIT_1 : SPI_CSS_BIT_0)
+
+#else
+
+#if HAS_SPI_0
+#define SPI_BUF(bus)           SPI_BUF_0
+#define SPI_CSR(bus)           SPI_CSR_0
+#define SPI_BAUD(bus)          SPI_BAUD_0
+#define SPI_GCR(bus)           SPI_GCR_0
+#define SPI_CFG_MASK(bus)      SPI_CFG_MASK_0
+#define SPI_DMA_TX(bus)                SPI_DMA_TX_0
+#define SPI_DMA_RX(bus)                SPI_DMA_RX_0
+#define SPI_CFG(bus)           SPI_CFG_0
+#define SPI_SEL(bus)           SPI_SEL_0
+#define SPI_BITS(bus)          SPI_BITS_0
+#define SPI_CSS_BIT(bus)       SPI_CSS_BIT_0
+#endif
+#if HAS_SPI_1
+#define SPI_BUF(bus)           SPI_BUF_1
+#define SPI_CSR(bus)           SPI_CSR_1
+#define SPI_BAUD(bus)          SPI_BAUD_1
+#define SPI_GCR(bus)           SPI_GCR_1
+#define SPI_CFG_MASK(bus)      SPI_CFG_MASK_1
+#define SPI_DMA_TX(bus)                SPI_DMA_TX_1
+#define SPI_DMA_RX(bus)                SPI_DMA_RX_1
+#define SPI_CFG(bus)           SPI_CFG_1
+#define SPI_SEL(bus)           SPI_SEL_1
+#define SPI_BITS(bus)          SPI_BITS_1
+#define SPI_CSS_BIT(bus)       SPI_CSS_BIT_1
+#endif
+
+#endif /* MULTI_SPI */
+
+#if AO_SPI_SLAVE
+#define CSS(bus)               SPI_CSS_BIT(bus)
+#define UxCSR_DIRECTION        UxCSR_SLAVE
+#else
+#define CSS(bus)               0
+#define UxCSR_DIRECTION        UxCSR_MASTER
+#endif
+
 /* Shared mutex to protect SPI bus, must cover the entire
  * operation, from CS low to CS high. This means that any SPI
  * user must protect the SPI bus with this mutex
  */
-__xdata uint8_t        ao_spi_mutex;
-__xdata uint8_t ao_spi_dma_in_done;
-__xdata uint8_t ao_spi_dma_out_done;
+__xdata uint8_t        ao_spi_mutex[N_SPI];
+__xdata uint8_t ao_spi_dma_in_done[N_SPI];
+__xdata uint8_t ao_spi_dma_out_done[N_SPI];
 
-uint8_t        ao_spi_dma_out_id;
-uint8_t ao_spi_dma_in_id;
+uint8_t        ao_spi_dma_out_id[N_SPI];
+uint8_t ao_spi_dma_in_id[N_SPI];
 
 static __xdata uint8_t ao_spi_const;
 
+
 /* Send bytes over SPI.
  *
  * This sets up two DMA engines, one writing the data and another reading
@@ -37,37 +182,54 @@ static __xdata uint8_t ao_spi_const;
  * is complete, as the transmit register is double buffered and hence signals
  * completion one byte before the transfer is actually complete
  */
+#if MULTI_SPI
+void
+ao_spi_send(void __xdata *block, uint16_t len, uint8_t bus) __reentrant
+#else
 void
 ao_spi_send_bus(void __xdata *block, uint16_t len) __reentrant
+#define bus    0
+#endif
 {
-       ao_dma_set_transfer(ao_spi_dma_in_id,
-                           &U0DBUFXADDR,
+       ao_dma_set_transfer(ao_spi_dma_in_id[bus],
+                           SPI_BUF(bus),
                            &ao_spi_const,
                            len,
                            DMA_CFG0_WORDSIZE_8 |
                            DMA_CFG0_TMODE_SINGLE |
-                           DMA_CFG0_TRIGGER_URX0,
+                           SPI_DMA_RX(bus),
                            DMA_CFG1_SRCINC_0 |
                            DMA_CFG1_DESTINC_0 |
                            DMA_CFG1_PRIORITY_NORMAL);
-
-       ao_dma_set_transfer(ao_spi_dma_out_id,
+       ao_dma_set_transfer(ao_spi_dma_out_id[bus],
                            block,
-                           &U0DBUFXADDR,
+                           SPI_BUF(bus),
                            len,
                            DMA_CFG0_WORDSIZE_8 |
                            DMA_CFG0_TMODE_SINGLE |
-                           DMA_CFG0_TRIGGER_UTX0,
+                           SPI_DMA_TX(bus),
                            DMA_CFG1_SRCINC_1 |
                            DMA_CFG1_DESTINC_0 |
                            DMA_CFG1_PRIORITY_NORMAL);
 
-       ao_dma_start(ao_spi_dma_in_id);
-       ao_dma_start(ao_spi_dma_out_id);
-       ao_dma_trigger(ao_spi_dma_out_id);
-       __critical while (!ao_spi_dma_in_done)
-               ao_sleep(&ao_spi_dma_in_done);
+       ao_dma_start(ao_spi_dma_in_id[bus]);
+       ao_dma_start(ao_spi_dma_out_id[bus]);
+       ao_dma_trigger(ao_spi_dma_out_id[bus]);
+#if !AO_SPI_SLAVE
+       __critical while (!ao_spi_dma_in_done[bus])
+               ao_sleep(&ao_spi_dma_in_done[bus]);
+#endif
+#undef bus
+}
+
+#if AO_SPI_SLAVE
+void
+ao_spi_send_wait(void)
+{
+       __critical while (!ao_spi_dma_in_done[0])
+               ao_sleep(&ao_spi_dma_in_done[0]);
 }
+#endif
 
 /* Receive bytes over SPI.
  *
@@ -75,85 +237,102 @@ ao_spi_send_bus(void __xdata *block, uint16_t len) __reentrant
  * writing constant values to the SPI transmitter as that is what
  * clocks the data coming in.
  */
+#if MULTI_SPI
+void
+ao_spi_recv(void __xdata *block, uint16_t len, uint8_t bus) __reentrant
+#else
 void
 ao_spi_recv_bus(void __xdata *block, uint16_t len) __reentrant
+#define bus 0
+#endif
 {
-       ao_dma_set_transfer(ao_spi_dma_in_id,
-                           &U0DBUFXADDR,
+       ao_dma_set_transfer(ao_spi_dma_in_id[bus],
+                           SPI_BUF(bus),
                            block,
                            len,
                            DMA_CFG0_WORDSIZE_8 |
                            DMA_CFG0_TMODE_SINGLE |
-                           DMA_CFG0_TRIGGER_URX0,
+                           SPI_DMA_RX(bus),
                            DMA_CFG1_SRCINC_0 |
                            DMA_CFG1_DESTINC_1 |
                            DMA_CFG1_PRIORITY_NORMAL);
 
-       ao_spi_const = 0xff;
+       ao_spi_const = SPI_CONST;
 
-       ao_dma_set_transfer(ao_spi_dma_out_id,
+#if !AO_SPI_SLAVE
+       ao_dma_set_transfer(ao_spi_dma_out_id[bus],
                            &ao_spi_const,
-                           &U0DBUFXADDR,
+                           SPI_BUF(bus),
                            len,
                            DMA_CFG0_WORDSIZE_8 |
                            DMA_CFG0_TMODE_SINGLE |
-                           DMA_CFG0_TRIGGER_UTX0,
+                           SPI_DMA_TX(bus),
                            DMA_CFG1_SRCINC_0 |
                            DMA_CFG1_DESTINC_0 |
                            DMA_CFG1_PRIORITY_NORMAL);
+#endif
 
-       ao_dma_start(ao_spi_dma_in_id);
-       ao_dma_start(ao_spi_dma_out_id);
-       ao_dma_trigger(ao_spi_dma_out_id);
-       __critical while (!ao_spi_dma_in_done)
-               ao_sleep(&ao_spi_dma_in_done);
+       ao_dma_start(ao_spi_dma_in_id[bus]);
+#if !AO_SPI_SLAVE
+       ao_dma_start(ao_spi_dma_out_id[bus]);
+       ao_dma_trigger(ao_spi_dma_out_id[bus]);
+       __critical while (!ao_spi_dma_in_done[bus])
+               ao_sleep(&ao_spi_dma_in_done[bus]);
+#endif
 }
 
-/*
- * Initialize USART0 for SPI using config alt 2
+#if AO_SPI_SLAVE
+void
+ao_spi_recv_wait(void)
+{
+       __critical while (!ao_spi_dma_in_done[0])
+               ao_sleep(&ao_spi_dma_in_done[0]);
+}
+#endif
+
+/* Set up the USART.
  *
- *     MO      P1_5
- *     MI      P1_4
- *     CLK     P1_3
+ * SPI master/slave mode
+ */
+/* Set the baud rate and signal parameters
  *
- * Chip select is the responsibility of the caller
+ * The cc1111 is limited to a 24/8 MHz SPI clock.
+ * Every peripheral I've ever seen goes faster than that,
+ * so set the clock to 3MHz (BAUD_E 17, BAUD_M 0)
  */
+#define SPI_INIT(bus,o)        do {                                            \
+               /* Set up the USART pin assignment */                   \
+               PERCFG = (PERCFG & ~SPI_CFG_MASK(bus)) | SPI_CFG(bus);  \
+                                                                       \
+               /* Make the SPI pins be controlled by the USART peripheral */ \
+               SPI_SEL(bus) |= SPI_BITS(bus) | CSS(bus);               \
+               SPI_CSR(bus) = (UxCSR_MODE_SPI | UxCSR_RE | UxCSR_DIRECTION); \
+               SPI_BAUD(bus) = 0;                                      \
+               SPI_GCR(bus) = (UxGCR_CPOL_NEGATIVE |                   \
+                               UxGCR_CPHA_FIRST_EDGE |                 \
+                               UxGCR_ORDER_MSB |                       \
+                               (17 << UxGCR_BAUD_E_SHIFT));            \
+               /* Set up OUT DMA */                                    \
+               ao_spi_dma_out_id[o] = ao_dma_alloc(&ao_spi_dma_out_done[o]); \
+                                                                       \
+               /* Set up IN DMA */                                     \
+               ao_spi_dma_in_id[o] = ao_dma_alloc(&ao_spi_dma_in_done[o]);     \
+       } while (0)
 
 void
 ao_spi_init(void)
 {
-       /* Set up the USART pin assignment */
-       PERCFG = (PERCFG & ~PERCFG_U0CFG_ALT_MASK) | PERCFG_U0CFG_ALT_2;
-
-       /* Ensure that USART0 takes precidence over USART1 for pins that
-        * they share
+       /* Ensure that SPI USART takes precidence over the other USART
+        * for pins that they share
         */
-       P2SEL = (P2SEL & ~P2SEL_PRI3P1_MASK) | P2SEL_PRI3P1_USART0;
+#ifdef SPI_PRI
+       P2SEL = (P2SEL & ~P2SEL_PRI3P1_MASK) | SPI_PRI;
+#endif
 
-       /* Make the SPI pins be controlled by the USART peripheral */
-       P1SEL |= ((1 << 5) | (1 << 4) | (1 << 3));
-
-       /* Set up OUT DMA */
-       ao_spi_dma_out_id = ao_dma_alloc(&ao_spi_dma_out_done);
-
-       /* Set up IN DMA */
-       ao_spi_dma_in_id = ao_dma_alloc(&ao_spi_dma_in_done);
-
-       /* Set up the USART.
-        *
-        * SPI master mode
-        */
-       U0CSR = (UxCSR_MODE_SPI | UxCSR_RE | UxCSR_MASTER);
-
-       /* Set the baud rate and signal parameters
-        *
-        * The cc1111 is limited to a 24/8 MHz SPI clock.
-        * Every peripheral I've ever seen goes faster than that,
-        * so set the clock to 3MHz (BAUD_E 17, BAUD_M 0)
-        */
-       U0BAUD = 0;
-       U0GCR = (UxGCR_CPOL_NEGATIVE |
-                UxGCR_CPHA_FIRST_EDGE |
-                UxGCR_ORDER_MSB |
-                (17 << UxGCR_BAUD_E_SHIFT));
+#if HAS_SPI_0
+       SPI_INIT(0, 0);
+#endif
+#if HAS_SPI_1
+       SPI_INIT(1, MULTI_SPI);
+#endif
 }