sw: add initial tests for spi and rgb

These tests are still a work-in-progress, but they form the basis of
what will be the factory test.

Signed-off-by: Sean Cross <sean@xobs.io>

sw/include/hw/common.h

@@ -0,0 +1,52 @@
+#ifndef __HW_COMMON_H
+#define __HW_COMMON_H
+
+#include <stdint.h>
+
+/* To overwrite CSR accessors, define extern, non-inlined versions
+ * of csr_read[bwl]() and csr_write[bwl](), and define
+ * CSR_ACCESSORS_DEFINED.
+ */
+
+#ifndef CSR_ACCESSORS_DEFINED
+#define CSR_ACCESSORS_DEFINED
+
+#ifdef __ASSEMBLER__
+#define MMPTR(x) x
+#else /* ! __ASSEMBLER__ */
+#define MMPTR(x) (*((volatile unsigned int *)(x)))
+
+static inline void csr_writeb(uint8_t value, uint32_t addr)
+{
+	*((volatile uint8_t *)addr) = value;
+}
+
+static inline uint8_t csr_readb(uint32_t addr)
+{
+	return *(volatile uint8_t *)addr;
+}
+
+static inline void csr_writew(uint16_t value, uint32_t addr)
+{
+	*((volatile uint16_t *)addr) = value;
+}
+
+static inline uint16_t csr_readw(uint32_t addr)
+{
+	return *(volatile uint16_t *)addr;
+}
+
+static inline void csr_writel(uint32_t value, uint32_t addr)
+{
+	*((volatile uint32_t *)addr) = value;
+}
+
+static inline uint32_t csr_readl(uint32_t addr)
+{
+	return *(volatile uint32_t *)addr;
+}
+#endif /* ! __ASSEMBLER__ */
+
+#endif /* ! CSR_ACCESSORS_DEFINED */
+
+#endif /* __HW_COMMON_H */

sw/include/rgb.h

@@ -6,5 +6,6 @@ void rgb_mode_idle(void);
 void rgb_mode_done(void);
 void rgb_mode_writing(void);
 void rgb_mode_error(void);
+void rgb_mode_off(void);
 
 #endif /* _RGB_H_ */

sw/include/spi.h

@@ -50,45 +50,43 @@ struct spi_id {
 
 struct ff_spi;
 
-void spiPause(struct ff_spi *spi);
-void spiBegin(struct ff_spi *spi);
-void spiEnd(struct ff_spi *spi);
+void spiPause(void);
+void spiBegin(void);
+void spiEnd(void);
 
-//void spiSingleTx(struct ff_spi *spi, uint8_t out);
-//uint8_t spiSingleRx(struct ff_spi *spi);
-//void spiDualTx(struct ff_spi *spi, uint8_t out);
-//void spiQuadTx(struct ff_spi *spi, uint8_t out);
-void spiCommand(struct ff_spi *spi, uint8_t cmd);
-//uint8_t spiDualRx(struct ff_spi *spi);
-//uint8_t spiQuadRx(struct ff_spi *spi);
-int spiTx(struct ff_spi *spi, uint8_t word);
-uint8_t spiRx(struct ff_spi *spi);
-uint8_t spiReadStatus(struct ff_spi *spi, uint8_t sr);
-void spiWriteStatus(struct ff_spi *spi, uint8_t sr, uint8_t val);
-void spiReadSecurity(struct ff_spi *spi, uint8_t sr, uint8_t security[256]);
-void spiWriteSecurity(struct ff_spi *spi, uint8_t sr, uint8_t security[256]);
-int spiSetType(struct ff_spi *spi, enum spi_type type);
-int spiRead(struct ff_spi *spi, uint32_t addr, uint8_t *data, unsigned int count);
-int spiIsBusy(struct ff_spi *spi);
-int spiBeginErase32(struct ff_spi *spi, uint32_t erase_addr);
-int spiBeginErase64(struct ff_spi *spi, uint32_t erase_addr);
-int spiBeginWrite(struct ff_spi *spi, uint32_t addr, const void *data, unsigned int count);
+//void spiSingleTx(uint8_t out);
+//uint8_t spiSingleRx(void);
+//void spiDualTx(uint8_t out);
+//void spiQuadTx(uint8_t out);
+void spiCommand(uint8_t cmd);
+//uint8_t spiDualRx(void);
+//uint8_t spiQuadRx(void);
+int spiTx(uint8_t word);
+uint8_t spiRx(void);
+uint8_t spiReadStatus(uint8_t sr);
+void spiWriteStatus(uint8_t sr, uint8_t val);
+void spiReadSecurity(uint8_t sr, uint8_t security[256]);
+void spiWriteSecurity(uint8_t sr, uint8_t security[256]);
+int spiSetType(enum spi_type type);
+int spiRead(uint32_t addr, uint8_t *data, unsigned int count);
+int spiIsBusy(void);
+int spiBeginErase32(uint32_t erase_addr);
+int spiBeginErase64(uint32_t erase_addr);
+int spiBeginWrite(uint32_t addr, const void *data, unsigned int count);
 void spiEnableQuad(void);
 
-struct spi_id spiId(struct ff_spi *spi);
-void spiOverrideSize(struct ff_spi *spi, uint32_t new_size);
+struct spi_id spiId(void);
+void spiOverrideSize(uint32_t new_size);
 
-//int spi_wait_for_not_busy(struct ff_spi *spi);
-int spiWrite(struct ff_spi *spi, uint32_t addr, const uint8_t *data, unsigned int count);
-uint8_t spiReset(struct ff_spi *spi);
-int spiInit(struct ff_spi *spi);
+int spiWrite(uint32_t addr, const uint8_t *data, unsigned int count);
+uint8_t spiReset(void);
+int spi_init(void);
 
-void spiHold(struct ff_spi *spi);
-void spiUnhold(struct ff_spi *spi);
-void spiSwapTxRx(struct ff_spi *spi);
+void spiHold(void);
+void spiUnhold(void);
+void spiSwapTxRx(void);
 
-struct ff_spi *spiAlloc(void);
-void spiSetPin(struct ff_spi *spi, enum spi_pin pin, int val);
+void spiSetPin(enum spi_pin pin, int val);
 void spiFree(void);
 
 #endif /* BB_SPI_H_ */

sw/include/usb-desc.h

@@ -62,7 +62,7 @@ struct usb_string_descriptor_struct {
 #define PRODUCT_NAME              u"Fomu Factory Test " GIT_VERSION
 #define PRODUCT_NAME_LEN          sizeof(PRODUCT_NAME)
 #define EP0_SIZE                  64
-#define NUM_INTERFACE             1
+#define NUM_INTERFACE             2
 #define CONFIG_DESC_SIZE          67
 #define USB_DT_INTERFACE_SIZE			9
 

sw/include/usb.h

@@ -33,7 +33,7 @@ void usb_idle(void);
 void usb_disconnect(void);
 
 int usb_irq_happened(void);
-void usb_setup(const struct usb_setup_request *setup);
+int usb_setup(const struct usb_setup_request *setup);
 void usb_send(const void *data, int total_count);
 void usb_ack_in(void);
 void usb_ack_out(void);