remove redundant headers, consolidate in common directory

joeycastillo · Oct 14, 2024 · e058bca · e058bca
1 parent 8372cef
commit e058bca
Show file tree

Hide file tree

Showing 60 changed files with 155 additions and 3,533 deletions.
diff --git a/chips/samd11/startup_samd11.c b/chips/samd11/startup_samd11.c
@@ -27,7 +27,9 @@
  */
 
 //-----------------------------------------------------------------------------
+#if !__EMSCRIPTEN__
 #include "samd11.h"
+#endif
 
 //-----------------------------------------------------------------------------
 #define DUMMY __attribute__ ((weak, alias ("irq_handler_dummy")))
@@ -120,6 +122,7 @@ void (* const vectors[])(void) =
 //-----------------------------------------------------------------------------
 void irq_handler_reset(void)
 {
+#if !__EMSCRIPTEN__
     unsigned int *src, *dst;
 
     src = &_etext;
@@ -132,6 +135,7 @@ void irq_handler_reset(void)
         *dst++ = 0;
 
     SCB->VTOR = (uint32_t)vectors;
+#endif
 
     main();
 

diff --git a/chips/samd21/startup_samd21.c b/chips/samd21/startup_samd21.c
@@ -27,7 +27,9 @@
  */
 
 //-----------------------------------------------------------------------------
+#if !__EMSCRIPTEN__
 #include "samd21.h"
+#endif
 
 //-----------------------------------------------------------------------------
 #define DUMMY __attribute__ ((weak, alias ("irq_handler_dummy")))
@@ -138,6 +140,7 @@ void (* const vectors[])(void) =
 //-----------------------------------------------------------------------------
 void irq_handler_reset(void)
 {
+#if !__EMSCRIPTEN__
     unsigned int *src, *dst;
 
     src = &_etext;
@@ -150,6 +153,7 @@ void irq_handler_reset(void)
         *dst++ = 0;
 
     SCB->VTOR = (uint32_t)vectors;
+#endif
 
     main();
 

diff --git a/chips/samd51/startup_samd51.c b/chips/samd51/startup_samd51.c
@@ -27,7 +27,9 @@
  */
 
 //-----------------------------------------------------------------------------
+#if !__EMSCRIPTEN__
 #include "samd51.h"
+#endif
 
 //-----------------------------------------------------------------------------
 #define DUMMY __attribute__ ((weak, alias ("irq_handler_dummy")))
@@ -429,6 +431,7 @@ void (* const vectors[])(void) =
 //-----------------------------------------------------------------------------
 void irq_handler_reset(void)
 {
+#if !__EMSCRIPTEN__
     unsigned int *src, *dst;
 
     src = &_etext;
@@ -441,6 +444,7 @@ void irq_handler_reset(void)
         *dst++ = 0;
 
     SCB->VTOR = (uint32_t)vectors;
+#endif
 
     main();
 

diff --git a/chips/saml21/startup_saml21.c b/chips/saml21/startup_saml21.c
@@ -27,7 +27,9 @@
  */
 
 //-----------------------------------------------------------------------------
+#if !__EMSCRIPTEN__
 #include "saml21.h"
+#endif
 
 //-----------------------------------------------------------------------------
 #define DUMMY __attribute__ ((weak, alias ("irq_handler_dummy")))
@@ -138,6 +140,7 @@ void (* const vectors[])(void) =
 //-----------------------------------------------------------------------------
 void irq_handler_reset(void)
 {
+#if !__EMSCRIPTEN__
     unsigned int *src, *dst;
 
     src = &_etext;
@@ -150,6 +153,7 @@ void irq_handler_reset(void)
         *dst++ = 0;
 
     SCB->VTOR = (uint32_t)vectors;
+#endif
 
     main();
 

diff --git a/chips/saml22/startup_saml22.c b/chips/saml22/startup_saml22.c
@@ -27,7 +27,9 @@
  */
 
 //-----------------------------------------------------------------------------
+#if !__EMSCRIPTEN__
 #include "saml22.h"
+#endif
 
 //-----------------------------------------------------------------------------
 #define DUMMY __attribute__ ((weak, alias ("irq_handler_dummy")))
@@ -134,6 +136,7 @@ void (* const vectors[])(void) =
 //-----------------------------------------------------------------------------
 void irq_handler_reset(void)
 {
+#if !__EMSCRIPTEN__
     unsigned int *src, *dst;
 
     src = &_etext;
@@ -146,6 +149,7 @@ void irq_handler_reset(void)
         *dst++ = 0;
 
     SCB->VTOR = (uint32_t)vectors;
+#endif
 
     main();
 

diff --git a/dummy/peripherals/adc.h → common/adc.h b/dummy/peripherals/adc.h → common/adc.h
diff --git a/dummy/peripherals/dac.h → common/dac.h b/dummy/peripherals/dac.h → common/dac.h
diff --git a/peripherals/dma.h → common/dma.h b/peripherals/dma.h → common/dma.h
diff --git a/peripherals/dma_util.h → common/dma_util.h b/peripherals/dma_util.h → common/dma_util.h
diff --git a/dummy/peripherals/eic.h → common/eic.h b/dummy/peripherals/eic.h → common/eic.h
diff --git a/common/hal_gpio.h b/common/hal_gpio.h
@@ -29,6 +29,9 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
+
+#include <stdbool.h>
+#include <stdint.h>
 #include "sam.h"
 
 #pragma once
@@ -53,6 +56,96 @@
 #define HAL_GPIO_PMUX_M      12
 #define HAL_GPIO_PMUX_N      13
 
+#if __EMSCRIPTEN__
+
+extern bool pin_levels[3][32];
+
+#define HAL_GPIO_PIN(name, port, pin)            \
+  static inline void HAL_GPIO_##name##_set(void)        \
+  {                    \
+    pin_levels[HAL_GPIO_PORT##port][pin] = true; \
+    (void)HAL_GPIO_##name##_set;            \
+  }                    \
+                    \
+  static inline void HAL_GPIO_##name##_clr(void)        \
+  {                    \
+    pin_levels[HAL_GPIO_PORT##port][pin] = false; \
+    (void)HAL_GPIO_##name##_clr;            \
+  }                    \
+                    \
+  static inline void HAL_GPIO_##name##_toggle(void)        \
+  {                    \
+    pin_levels[HAL_GPIO_PORT##port][pin] = !pin_levels[HAL_GPIO_PORT##port][pin]; \
+    (void)HAL_GPIO_##name##_toggle;            \
+  }                    \
+                    \
+  static inline void HAL_GPIO_##name##_write(int value)        \
+  {                    \
+    pin_levels[HAL_GPIO_PORT##port][pin] = !!value; \
+    (void)HAL_GPIO_##name##_write;            \
+  }                    \
+                    \
+  static inline void HAL_GPIO_##name##_drvstr(int value)        \
+  {                    \
+    (void)HAL_GPIO_##name##_write;            \
+  }                    \
+                    \
+  static inline void HAL_GPIO_##name##_in(void)          \
+  {                    \
+    (void)HAL_GPIO_##name##_in;              \
+  }                    \
+                    \
+  static inline void HAL_GPIO_##name##_out(void)        \
+  {                    \
+    (void)HAL_GPIO_##name##_out;            \
+  }                    \
+                    \
+  static inline void HAL_GPIO_##name##_off(void)        \
+  {                    \
+    (void)HAL_GPIO_##name##_off;            \
+  }                    \
+                    \
+  static inline void HAL_GPIO_##name##_pullup(void)        \
+  {                    \
+    (void)HAL_GPIO_##name##_pullup;            \
+  }                    \
+                    \
+  static inline void HAL_GPIO_##name##_pulldown(void)        \
+  {                    \
+    (void)HAL_GPIO_##name##_pulldown;            \
+  }                    \
+                    \
+  static inline int HAL_GPIO_##name##_read(void)        \
+  {                    \
+    return pin_levels[HAL_GPIO_PORT##port][pin]; \
+    (void)HAL_GPIO_##name##_read;            \
+  }                    \
+                    \
+  static inline int HAL_GPIO_##name##_state(void)        \
+  {                    \
+    return 0; \
+    (void)HAL_GPIO_##name##_state;            \
+  }                    \
+                    \
+  static inline void HAL_GPIO_##name##_pmuxen(int mux)        \
+  {                    \
+    (void)HAL_GPIO_##name##_pmuxen;            \
+  }                    \
+                    \
+  static inline void HAL_GPIO_##name##_pmuxdis(void)        \
+  {                    \
+    (void)HAL_GPIO_##name##_pmuxdis;            \
+  }                    \
+                    \
+  static inline uint8_t HAL_GPIO_##name##_pin(void)        \
+  {                    \
+    return ((HAL_GPIO_PORT##port << 5) | (pin & 0x1f));					\
+    (void)HAL_GPIO_##name##_pin;            \
+  }                    \
+                    \
+
+#else
+
 #define HAL_GPIO_PIN(name, port, pin)						\
   static inline void HAL_GPIO_##name##_set(void)				\
   {										\
@@ -161,6 +254,8 @@
   }										\
                     \
 
+#endif // __EMSCRIPTEN__
+
 HAL_GPIO_PIN(SWCLK, A, 30)
 HAL_GPIO_PIN(SWDIO, A, 31)
 

diff --git a/peripherals/i2c.h → common/i2c.h b/peripherals/i2c.h → common/i2c.h
diff --git a/peripherals/i2s.h → common/i2s.h b/peripherals/i2s.h → common/i2s.h
diff --git a/dummy/peripherals/opamp.h → common/opamp.h b/dummy/peripherals/opamp.h → common/opamp.h
diff --git a/peripherals/ptc.h → common/ptc.h b/peripherals/ptc.h → common/ptc.h
diff --git a/dummy/peripherals/rtc.h → common/rtc.h b/dummy/peripherals/rtc.h → common/rtc.h
diff --git a/common/sam.h b/common/sam.h
@@ -1,5 +1,24 @@
 #pragma once
 
+#if __EMSCRIPTEN__
+
+typedef int generic_clock_generator_t;
+
+#define HAL_GPIO_PMUX_EIC (0)
+#define HAL_GPIO_PMUX_ADC (1)
+#define HAL_GPIO_PMUX_AC (1)
+#define HAL_GPIO_PMUX_PTC (1)
+#define HAL_GPIO_PMUX_SERCOM (2)
+#define HAL_GPIO_PMUX_SERCOM_ALT (3)
+
+#define DMAC_CHCTRLB_TRIGACT_BLOCK_Val  (0)
+#define DMAC_CHCTRLB_TRIGACT_BEAT_Val   (2)
+#define DMAC_CHCTRLB_TRIGACT_TRANSACTION_Val (3)
+
+typedef int DmacDescriptor;
+
+#else
+
 #define HAL_GPIO_PMUX_EIC HAL_GPIO_PMUX_A
 #define HAL_GPIO_PMUX_ADC HAL_GPIO_PMUX_B
 #define HAL_GPIO_PMUX_AC HAL_GPIO_PMUX_B
@@ -166,3 +185,5 @@ typedef enum {
     GENERIC_CLOCK_11 = GCLK_PCHCTRL_GEN_GCLK11_Val,
 } generic_clock_generator_t;
 #endif
+
+#endif // __EMSCRIPTEN__
diff --git a/dummy/peripherals/sercom.h → common/sercom.h b/dummy/peripherals/sercom.h → common/sercom.h
diff --git a/dummy/peripherals/slcd.h → common/slcd.h b/dummy/peripherals/slcd.h → common/slcd.h
diff --git a/dummy/peripherals/spi.h → common/spi.h b/dummy/peripherals/spi.h → common/spi.h
diff --git a/common/system.h b/common/system.h
@@ -33,6 +33,14 @@
 
 #pragma once
 
+#if __EMSCRIPTEN__
+
+typedef int tc_instance_details_t;
+typedef int tcc_instance_details_t;
+typedef int sercom_instance_details_t;
+
+#else
+
 typedef struct {
     Tc* tc;
     uint32_t clock_enable_mask;
@@ -52,6 +60,8 @@ typedef struct {
     uint8_t interrupt_line;
 } sercom_instance_details_t;
 
+#endif
+
 extern const tc_instance_details_t TC_Peripherals[];
 extern const uint8_t Num_TC_Instances;
 extern const uint8_t TC_First_Index;

diff --git a/peripherals/tc.h → common/tc.h b/peripherals/tc.h → common/tc.h
diff --git a/dummy/peripherals/tcc.h → common/tcc.h b/dummy/peripherals/tcc.h → common/tcc.h
diff --git a/peripherals/uart.h → common/uart.h b/peripherals/uart.h → common/uart.h
diff --git a/peripherals/usb.h → common/usb.h b/peripherals/usb.h → common/usb.h