patch hw defs

andryblack · andryblack · commit 36cdca52f341 · 2022-01-10T01:07:20.000+03:00
diff --git a/include/hardware/structs/adc.h b/include/hardware/structs/adc.h
@@ -86,6 +86,6 @@ typedef struct {
     io_ro_32 ints;
 } adc_hw_t;
 
-#define adc_hw ((adc_hw_t *const)ADC_BASE)
+#define adc_hw ((adc_hw_t*)ADC_BASE)
 
 #endif
diff --git a/include/hardware/structs/bus_ctrl.h b/include/hardware/structs/bus_ctrl.h
@@ -72,6 +72,6 @@ typedef struct {
     bus_ctrl_perf_hw_t counter[4];
 } bus_ctrl_hw_t;
 
-#define bus_ctrl_hw ((bus_ctrl_hw_t *const)BUSCTRL_BASE)
+#define bus_ctrl_hw ((bus_ctrl_hw_t*)BUSCTRL_BASE)
 
 #endif
diff --git a/include/hardware/structs/clocks.h b/include/hardware/structs/clocks.h
@@ -319,7 +319,7 @@ typedef struct {
     io_ro_32 ints;
 } clocks_hw_t;
 
-#define clocks_hw ((clocks_hw_t *const)CLOCKS_BASE)
+#define clocks_hw ((clocks_hw_t*)CLOCKS_BASE)
 
 static_assert( CLK_COUNT == 10, "");
 
diff --git a/include/hardware/structs/dma.h b/include/hardware/structs/dma.h
@@ -194,7 +194,7 @@ typedef struct {
     } ch[NUM_DMA_CHANNELS];
 } dma_debug_hw_t;
 
-#define dma_hw ((dma_hw_t *const)DMA_BASE)
+#define dma_hw ((dma_hw_t*)DMA_BASE)
 #define dma_debug_hw ((dma_debug_hw_t *const)(DMA_BASE + DMA_CH0_DBG_CTDREQ_OFFSET))
 
 static_assert( NUM_DMA_TIMERS == 4, "");
diff --git a/include/hardware/structs/i2c.h b/include/hardware/structs/i2c.h
@@ -327,7 +327,7 @@ typedef struct {
     io_ro_32 comp_type;
 } i2c_hw_t;
 
-#define i2c0_hw ((i2c_hw_t *const)I2C0_BASE)
-#define i2c1_hw ((i2c_hw_t *const)I2C1_BASE)
+#define i2c0_hw ((i2c_hw_t*)I2C0_BASE)
+#define i2c1_hw ((i2c_hw_t*)I2C1_BASE)
 
 #endif
diff --git a/include/hardware/structs/iobank0.h b/include/hardware/structs/iobank0.h
@@ -208,7 +208,7 @@ typedef struct {
     io_irq_ctrl_hw_t dormant_wake_irq_ctrl;
 } iobank0_hw_t;
 
-#define iobank0_hw ((iobank0_hw_t *const)IO_BANK0_BASE)
+#define iobank0_hw ((iobank0_hw_t*)IO_BANK0_BASE)
 /// \end::iobank0_hw[]
 
 static_assert( NUM_BANK0_GPIOS == 30, "");
diff --git a/include/hardware/structs/ioqspi.h b/include/hardware/structs/ioqspi.h
@@ -167,7 +167,7 @@ typedef struct {
     io_qspi_ctrl_hw_t dormant_wake_qspi_ctrl;
 } ioqspi_hw_t;
 
-#define ioqspi_hw ((ioqspi_hw_t *const)IO_QSPI_BASE)
+#define ioqspi_hw ((ioqspi_hw_t*)IO_QSPI_BASE)
 
 static_assert( NUM_QSPI_GPIOS == 6, "");
 
diff --git a/include/hardware/structs/pads_qspi.h b/include/hardware/structs/pads_qspi.h
@@ -40,7 +40,7 @@ typedef struct {
     io_rw_32 io[NUM_QSPI_GPIOS]; // 6
 } pads_qspi_hw_t;
 
-#define pads_qspi_hw ((pads_qspi_hw_t *const)PADS_QSPI_BASE)
+#define pads_qspi_hw ((pads_qspi_hw_t*)PADS_QSPI_BASE)
 
 static_assert( NUM_QSPI_GPIOS == 6, "");
 
diff --git a/include/hardware/structs/padsbank0.h b/include/hardware/structs/padsbank0.h
@@ -40,7 +40,7 @@ typedef struct {
     io_rw_32 io[NUM_BANK0_GPIOS]; // 30
 } padsbank0_hw_t;
 
-#define padsbank0_hw ((padsbank0_hw_t *const)PADS_BANK0_BASE)
+#define padsbank0_hw ((padsbank0_hw_t*)PADS_BANK0_BASE)
 
 static_assert( NUM_BANK0_GPIOS == 30, "");
 
diff --git a/include/hardware/structs/pio.h b/include/hardware/structs/pio.h
@@ -275,8 +275,8 @@ typedef struct {
     io_ro_32 ints1;
 } pio_hw_t;
 
-#define pio0_hw ((pio_hw_t *const)PIO0_BASE)
-#define pio1_hw ((pio_hw_t *const)PIO1_BASE)
+#define pio0_hw ((pio_hw_t*)PIO0_BASE)
+#define pio1_hw ((pio_hw_t*)PIO1_BASE)
 
 static_assert( NUM_PIO_STATE_MACHINES == 4, "");
 static_assert( PIO_INSTRUCTION_COUNT == 32, "");
diff --git a/include/hardware/structs/pll.h b/include/hardware/structs/pll.h
@@ -49,8 +49,8 @@ typedef struct {
     io_rw_32 prim;
 } pll_hw_t;
 
-#define pll_sys_hw ((pll_hw_t *const)PLL_SYS_BASE)
-#define pll_usb_hw ((pll_hw_t *const)PLL_USB_BASE)
+#define pll_sys_hw ((pll_hw_t*)PLL_SYS_BASE)
+#define pll_usb_hw ((pll_hw_t*)PLL_USB_BASE)
 /// \end::pll_hw[]
 
 #endif
diff --git a/include/hardware/structs/psm.h b/include/hardware/structs/psm.h
@@ -106,6 +106,6 @@ typedef struct {
     io_ro_32 done;
 } psm_hw_t;
 
-#define psm_hw ((psm_hw_t *const)PSM_BASE)
+#define psm_hw ((psm_hw_t*)PSM_BASE)
 
 #endif
diff --git a/include/hardware/structs/pwm.h b/include/hardware/structs/pwm.h
@@ -119,7 +119,7 @@ typedef struct {
     io_ro_32 ints;
 } pwm_hw_t;
 
-#define pwm_hw ((pwm_hw_t *const)PWM_BASE)
+#define pwm_hw ((pwm_hw_t*)PWM_BASE)
 
 static_assert( NUM_PWM_SLICES == 8, "");
 
diff --git a/include/hardware/structs/resets.h b/include/hardware/structs/resets.h
@@ -110,7 +110,7 @@ typedef struct {
     io_ro_32 reset_done;
 } resets_hw_t;
 
-#define resets_hw ((resets_hw_t *const)RESETS_BASE)
+#define resets_hw ((resets_hw_t*)RESETS_BASE)
 /// \end::resets_hw[]
 
 #endif
diff --git a/include/hardware/structs/rosc.h b/include/hardware/structs/rosc.h
@@ -81,6 +81,6 @@ typedef struct {
     io_rw_32 count;
 } rosc_hw_t;
 
-#define rosc_hw ((rosc_hw_t *const)ROSC_BASE)
+#define rosc_hw ((rosc_hw_t*)ROSC_BASE)
 
 #endif
diff --git a/include/hardware/structs/rtc.h b/include/hardware/structs/rtc.h
@@ -109,6 +109,6 @@ typedef struct {
     io_ro_32 ints;
 } rtc_hw_t;
 
-#define rtc_hw ((rtc_hw_t *const)RTC_BASE)
+#define rtc_hw ((rtc_hw_t*)RTC_BASE)
 
 #endif
diff --git a/include/hardware/structs/sio.h b/include/hardware/structs/sio.h
@@ -171,6 +171,6 @@ typedef struct {
     interp_hw_t interp[2];
 } sio_hw_t;
 
-#define sio_hw ((sio_hw_t *const)SIO_BASE)
+#define sio_hw ((sio_hw_t*)SIO_BASE)
 
 #endif
diff --git a/include/hardware/structs/spi.h b/include/hardware/structs/spi.h
@@ -94,7 +94,7 @@ typedef struct {
     io_rw_32 dmacr;
 } spi_hw_t;
 
-#define spi0_hw ((spi_hw_t *const)SPI0_BASE)
-#define spi1_hw ((spi_hw_t *const)SPI1_BASE)
+#define spi0_hw ((spi_hw_t*)SPI0_BASE)
+#define spi1_hw ((spi_hw_t*)SPI1_BASE)
 
 #endif
diff --git a/include/hardware/structs/ssi.h b/include/hardware/structs/ssi.h
@@ -205,6 +205,6 @@ typedef struct {
     io_rw_32 txd_drive_edge;
 } ssi_hw_t;
 
-#define ssi_hw ((ssi_hw_t *const)XIP_SSI_BASE)
+#define ssi_hw ((ssi_hw_t*)XIP_SSI_BASE)
 
 #endif
diff --git a/include/hardware/structs/syscfg.h b/include/hardware/structs/syscfg.h
@@ -72,6 +72,6 @@ typedef struct {
     io_rw_32 mempowerdown;
 } syscfg_hw_t;
 
-#define syscfg_hw ((syscfg_hw_t *const)SYSCFG_BASE)
+#define syscfg_hw ((syscfg_hw_t*)SYSCFG_BASE)
 
 #endif
diff --git a/include/hardware/structs/timer.h b/include/hardware/structs/timer.h
@@ -100,7 +100,7 @@ typedef struct {
     io_ro_32 ints;
 } timer_hw_t;
 
-#define timer_hw ((timer_hw_t *const)TIMER_BASE)
+#define timer_hw ((timer_hw_t*)TIMER_BASE)
 
 static_assert( NUM_TIMERS == 4, "");
 
diff --git a/include/hardware/structs/uart.h b/include/hardware/structs/uart.h
@@ -171,7 +171,7 @@ typedef struct {
     io_rw_32 dmacr;
 } uart_hw_t;
 
-#define uart0_hw ((uart_hw_t *const)UART0_BASE)
-#define uart1_hw ((uart_hw_t *const)UART1_BASE)
+#define uart0_hw ((uart_hw_t*)UART0_BASE)
+#define uart1_hw ((uart_hw_t*)UART1_BASE)
 
 #endif
diff --git a/include/hardware/structs/usb.h b/include/hardware/structs/usb.h
@@ -568,7 +568,7 @@ typedef struct {
     io_ro_32 ints;
 } usb_hw_t;
 
-#define usb_hw ((usb_hw_t *const)USBCTRL_REGS_BASE)
+#define usb_hw ((usb_hw_t*)USBCTRL_REGS_BASE)
 
 #define usb_dpram ((usb_device_dpram_t *)USBCTRL_DPRAM_BASE)
 #define usbh_dpram ((usb_host_dpram_t *)USBCTRL_DPRAM_BASE)
diff --git a/include/hardware/structs/vreg_and_chip_reset.h b/include/hardware/structs/vreg_and_chip_reset.h
@@ -44,6 +44,6 @@ typedef struct {
     io_rw_32 chip_reset;
 } vreg_and_chip_reset_hw_t;
 
-#define vreg_and_chip_reset_hw ((vreg_and_chip_reset_hw_t *const)VREG_AND_CHIP_RESET_BASE)
+#define vreg_and_chip_reset_hw ((vreg_and_chip_reset_hw_t*)VREG_AND_CHIP_RESET_BASE)
 
 #endif
diff --git a/include/hardware/structs/watchdog.h b/include/hardware/structs/watchdog.h
@@ -57,6 +57,6 @@ typedef struct {
     io_rw_32 tick;
 } watchdog_hw_t;
 
-#define watchdog_hw ((watchdog_hw_t *const)WATCHDOG_BASE)
+#define watchdog_hw ((watchdog_hw_t*)WATCHDOG_BASE)
 
 #endif
diff --git a/include/hardware/structs/xip_ctrl.h b/include/hardware/structs/xip_ctrl.h
@@ -63,7 +63,7 @@ typedef struct {
     io_ro_32 stream_fifo;
 } xip_ctrl_hw_t;
 
-#define xip_ctrl_hw ((xip_ctrl_hw_t *const)XIP_CTRL_BASE)
+#define xip_ctrl_hw ((xip_ctrl_hw_t*)XIP_CTRL_BASE)
 
 #define XIP_STAT_FIFO_FULL XIP_STAT_FIFO_FULL_BITS
 #define XIP_STAT_FIFO_EMPTY XIP_STAT_FIFO_EMPTY_BITS
diff --git a/include/hardware/structs/xosc.h b/include/hardware/structs/xosc.h
@@ -54,7 +54,7 @@ typedef struct {
     io_rw_32 count;
 } xosc_hw_t;
 
-#define xosc_hw ((xosc_hw_t *const)XOSC_BASE)
+#define xosc_hw ((xosc_hw_t*)XOSC_BASE)
 /// \end::xosc_hw[]
 
 #endif
diff --git a/update.py b/update.py
@@ -8,6 +8,7 @@
 import subprocess
 import binascii
 import struct
+import re
 from pathlib import Path
 import urllib.request
 
@@ -40,6 +41,13 @@ def run(where, command, stdin=None):
 def bitrev(x, width):
     return int("{:0{w}b}".format(x, w=width)[::-1], 2)
 
+hw_def_re = re.compile(r'#define (.+)_hw \(\((.+)_hw_t \*const\)(.+)_BASE\)')
+def process(l):
+	hw_def = hw_def_re.match(l)
+	if hw_def:
+		print("replace hw def {}".format(hw_def[1]))
+		return "#define {}_hw (({}_hw_t*){}_BASE)".format(hw_def[1],hw_def[2],hw_def[3])
+	return l
 
 with urllib.request.urlopen("https://api.github.com/repos/raspberrypi/pico-sdk/releases/latest") as response:
    tag = json.loads(response.read())["tag_name"]
@@ -69,7 +77,7 @@ def bitrev(x, width):
         # Copy, normalize newline and remove trailing whitespace
         with path.open("r", newline=None, encoding="utf-8", errors="replace") as rfile, \
                            dest.open("w", encoding="utf-8") as wfile:
-            wfile.writelines(l.rstrip()+"\n" for l in rfile.readlines())
+            wfile.writelines(process(l.rstrip())+"\n" for l in rfile.readlines())
 
 print("Building boot2 varints...")
 
