Added a whole bunch of fiddle files. Started improving boot process.

It still works.

2 files changed, 220 insertions, 57 deletions

diff --git a/src/blinky.c b/src/blinky.c
index 7e46389..d8a29bd 100644
--- a/src/blinky.c
+++ b/src/blinky.c
@@ -1,5 +1,12 @@
 #include <stdint.h>
 
+#include "ch573/gpio.h"
+
+#define GPIO_PORT_A ch573_gpio__gpio_port_a
+#define GPIO_PORT CH573_GPIO__GPIO_PORT_T_INTF
+
+static void start(void);
+
 /*
  * Function (or really pointer to code) for the reset interrupt handler.
  */
@@ -13,62 +20,15 @@ void delay(void);
 /* Type def to a void function to make things mor ereadable. */
 typedef void (*isr_routine)(void);
 
-/* Gpio configuration structure. This is exactly how it is laid out in
- * memory. In these registers bit X referes to pin X. */
-typedef struct {
-  /* The direction of the gpio pin. 1 = output, 0 = input. */
-  uint32_t dir;
-
-  /* The value of the gpio pin (for input). */
-  uint32_t in;
-
-  /* Write to set the output value for the pin. */
-  uint32_t out;
-
-  /* The clear value. Resets the pin to what it is at reset. */
-  uint32_t clr;
-
-  /* Sets the pin to be pull-up on logical 1 in input mode. */
-  uint32_t pu;
-
-  /* Sets whether the pin should be pull-down (open-drain) for logical 0 or
-   * drive for logical 1. 1 = pull-down, 0 = drive. */
-  uint32_t pd_drv;
-} gpio_t;
-
 /** The ISR Vector structure. This is linked to starting at address 0. */
-__attribute((__section__(".isr_vector"))) volatile struct {
-  // What NULL points to. nothing useful.
-  uint32_t reserved__;
-  // Called when the device boots or reset is pressed.
-  isr_routine reset_cb;
-  isr_routine nmi_cb;
-  isr_routine exc_cb;
-} isr_vectors = {.reset_cb = on_reset};
-
-// GPIO configuration registers. These are defined in the linker script.
-extern volatile gpio_t gpio_a;
-extern volatile gpio_t gpio_b;
-
-/* Main routine. This is called on_reset once everything else has been set up.
- */
-static void start(void)
-{
-  uint32_t bit = 1 << 8;
-  gpio_a.dir |= bit;     // Set to "out"
-  gpio_a.pd_drv |= bit;  // Set to "open drain"
-
-  for (;;) {
-    gpio_a.out &= ~bit;  // Pin low (turns on LED)
-    delay();
-    delay();
-    delay();
-    gpio_a.out |= bit;  // Pin high (turns off LED)
-    delay();
-    delay();
-    delay();
-  }
-}
+// __attribute((__section__(".isr_vector"))) volatile struct {
+//   // What NULL points to. nothing useful.
+//   uint32_t reserved__;
+//   // Called when the device boots or reset is pressed.
+//   isr_routine reset_cb;
+//   isr_routine nmi_cb;
+//   isr_routine exc_cb;
+// } isr_vectors = {.reset_cb = on_reset};
 
 /*
  * The reset callback.This has to be a naked function because the stack pointer
@@ -87,8 +47,68 @@ __attribute((naked)) void on_reset(void)
       : "r"(start));
 }
 
+uint32_t collatz(uint32_t n)
+{
+  uint32_t c = 0;
+
+  while (n > 1) {
+    if (n % 2 == 0) {
+      n /= 2;
+    } else {
+      n = n * 3 + 1;
+    }
+    c++;
+  }
+
+  return c;
+}
+
+void blink_n(int n)
+{
+  uint32_t bit = 1 << 8;
+  while (n > 0) {
+    GPIO_PORT.out.set(GPIO_PORT_A, OFF, 8);
+    delay();
+    GPIO_PORT.out.set(GPIO_PORT_A, ON, 8);
+    delay();
+    --n;
+  }
+}
+
 void delay(void)
 {
-  for (volatile uint32_t i = 0; i < 10000; ++i)
-    ;
+  for (volatile uint32_t i = 0; i < 10000; ++i);
+}
+
+/* Main routine. This is called on_reset once everything else has been set up.
+ */
+static void start(void)
+{
+  GPIO_PORT.dir.set(GPIO_PORT_A, DIR_OUT, 8);
+  GPIO_PORT.pd_drv.set(GPIO_PORT_A, PD_DRV_OPEN_DRAIN, 8);
+
+  for (;;) {
+    GPIO_PORT.out.set(GPIO_PORT_A, ON, 8);
+    delay();
+    delay();
+    delay();
+    GPIO_PORT.out.set(GPIO_PORT_A, OFF, 8);
+    delay();
+  }
+
+  // uint32_t i;
+  // for (i = 1;; ++i) {
+  //   uint32_t c = collatz(i);
+  //   blink_n(c);
+
+  //   delay();
+  //   delay();
+  //   delay();
+  //   delay();
+  //   delay();
+  //   delay();
+  //   delay();
+  //   delay();
+  //   delay();
+  // }
 }
diff --git a/src/init.c b/src/init.c
new file mode 100644
index 0000000..8d895f5
--- /dev/null
+++ b/src/init.c
@@ -0,0 +1,143 @@
+#include <stddef.h>
+#include <stdint.h>
+
+#include "isr_vector.h"
+#include "ch573/gpio.h"
+
+_Static_assert(offsetof(typeof(isr_vector_t), nmi_cb) == 0x8, "Offset wrong");
+
+_Static_assert(
+    offsetof(typeof(isr_vector_t), systick_cb) == 0x30, "Offset wrong ");
+
+_Static_assert(
+    offsetof(typeof(isr_vector_t), tmr0_cb) == 0x40, "Offset wrong ");
+
+_Static_assert(
+    offsetof(typeof(isr_vector_t), tmr1_cb) == 0x60, "Offset wrong ");
+
+_Static_assert(
+    offsetof(typeof(isr_vector_t), pwmx_cb) == 0x7c, "Offset wrong ");
+
+_Static_assert(
+    offsetof(typeof(isr_vector_t), wdog_bat_cb) == 0x8c, "Offset wrong ");
+
+void on_reset(void);
+
+void __attribute__((weak, interrupt)) default_irq_handler(void)
+{
+  return;
+}
+
+#define WEAK_IRQ(irq) \
+  void __attribute__((weak, alias("default_irq_handler"))) irq(void)
+
+WEAK_IRQ(irq_on_nmi);
+WEAK_IRQ(irq_on_exc);
+WEAK_IRQ(irq_on_systick);
+WEAK_IRQ(irq_on_swi);
+WEAK_IRQ(irq_on_tmr0);
+WEAK_IRQ(irq_on_gpio_a);
+WEAK_IRQ(irq_on_gpio_b);
+WEAK_IRQ(irq_on_spi0);
+WEAK_IRQ(irq_on_blel);
+WEAK_IRQ(irq_on_bleb);
+WEAK_IRQ(irq_on_usb);
+WEAK_IRQ(irq_on_tmr1);
+WEAK_IRQ(irq_on_tmr2);
+WEAK_IRQ(irq_on_uart0);
+WEAK_IRQ(irq_on_uart1);
+WEAK_IRQ(irq_on_rtc);
+WEAK_IRQ(irq_on_adc);
+WEAK_IRQ(irq_on_pwmx);
+WEAK_IRQ(irq_on_tmr3);
+WEAK_IRQ(irq_on_uart2);
+WEAK_IRQ(irq_on_uart3);
+WEAK_IRQ(irq_on_wdog_bat);
+
+/** The ISR Vector structure. This is linked to starting at address 0. */
+__attribute((__section__(".isr_vector"))) volatile isr_vector_t isr_vectors = {
+    .reset_cb = on_reset,
+    .nmi_cb = irq_on_nmi,
+    .exc_cb = irq_on_exc,
+    .systick_cb = irq_on_systick,
+    .swi_cb = irq_on_swi,
+    .tmr0_cb = irq_on_tmr0,
+    .gpio_a_cb = irq_on_gpio_a,
+    .gpio_b_cb = irq_on_gpio_b,
+    .spi0_cb = irq_on_spi0,
+    .blel_cb = irq_on_blel,
+    .bleb_cb = irq_on_bleb,
+    .usb_cb = irq_on_usb,
+    .tmr1_cb = irq_on_tmr1,
+    .tmr2_cb = irq_on_tmr2,
+    .uart0_cb = irq_on_uart0,
+    .uart1_cb = irq_on_uart1,
+    .rtc_cb = irq_on_rtc,
+    .adc_cb = irq_on_adc,
+    .pwmx_cb = irq_on_pwmx,
+    .tmr3_cb = irq_on_tmr3,
+    .uart2_cb = irq_on_uart2,
+    .uart3_cb = irq_on_uart3,
+    .wdog_bat_cb = irq_on_wdog_bat,
+};
+
+// Memory-mapped address of the data values in flash.
+extern uint32_t* DATA_VALUES_IN_FLASH;
+
+// Where the data is located in sram.
+extern uint32_t* DATA_SEGMENT_START;
+extern uint32_t* DATA_SEGMENT_STOP;
+
+// Where 0-initialized data is in sram.
+extern uint32_t* BSS_START;
+extern uint32_t* BSS_STOP;
+
+/*
+ * Initialize the data segment and the bss segment.
+ *
+ * This function loads data in the .data section from flash and puts it in
+ * memory where it can be edited and initialized the BSS data to 0.
+ */
+void init_data_segments(void)
+{
+  uint32_t* src = DATA_VALUES_IN_FLASH;
+  uint32_t* dest = DATA_SEGMENT_START;
+
+  while (dest != DATA_SEGMENT_STOP) {
+    *(dest++) = *(src++);
+  }
+
+  dest = BSS_START;
+  while (dest != BSS_STOP) {
+    *(dest++) = 0;
+  }
+}
+
+/*
+ *  External reference to the main() function.
+ */
+extern void main(void);
+
+#define GPIO_PORT_A ch573_gpio__gpio_port_a
+#define GPIO_PORT CH573_GPIO__GPIO_PORT_T_INTF
+/* Start function. Responsible for initializing the system and jumping to the
+ * main function. */
+// static void start(void)
+// {
+//   // init_data_segments();
+//   GPIO_PORT.dir.set(GPIO_PORT_A, DIR_OUT, 8);
+//   GPIO_PORT.pd_drv.set(GPIO_PORT_A, PD_DRV_OPEN_DRAIN, 8);
+//   GPIO_PORT.out.set(GPIO_PORT_A, OFF, 8);
+// 
+//   main();
+// }
+
+/*
+ * The reset callback.This has to be a naked function because the stack pointer
+ * may not be initialized!!.
+ */
+
+/*
+ * The reset callback.This has to be a naked function because the stack pointer
+ * may not be initialized!!.
+ */