Merge pull request #34 from arjanmels/feature-gpio

MabezDev · web-flow · commit 801f17264517 · 2020-06-17T11:24:29.000+01:00
Added renaming of gpio registers
diff --git a/Makefile b/Makefile
@@ -23,4 +23,4 @@ fmt:
 
 build:
 	cargo clean
-	cargo build
+	cargo xbuild --target xtensa-esp32-none-elf
diff --git a/svd/esp32.svd b/svd/esp32.svd
diff --git a/svd/patches/_gpio.yaml b/svd/patches/_gpio.yaml
@@ -0,0 +1,11 @@
+
+GPIO:
+  _array:
+    FUNC*_IN_SEL_CFG: 
+      description: Peripheral input selection register array
+    FUNC*_OUT_SEL_CFG: 
+      description: Peripheral output selection register array
+    PIN*: 
+      description: GPIO Configuration register array
+
+
diff --git a/svd/patches/_rename_bitfields.yaml b/svd/patches/_rename_bitfields.yaml
@@ -19,6 +19,13 @@ GPIO:
   "*":
     _strip:
       - GPIO_
+  "PIN*":
+    _strip:
+      - "PIN*_"
+  "FUNC*":
+    _strip:
+      - "FUNC*_"
+      - "SIG*_IN_"
 
 GPIO_SD:
   "*":
@@ -97,7 +104,15 @@ RTCCNTL:
 RTCIO:
   "*":
     _strip:
-      - RTCIO_
+      - RTC_GPIO_
+      - RTC_IO_
+  "PIN*":
+    _strip:
+      - "PIN*_"
+  "TOUCH_PAD*":
+    _strip:
+      - "TOUCH_PAD*_"
+
 
 SENS:
   "*":
diff --git a/svd/patches/_rename_registers.yaml b/svd/patches/_rename_registers.yaml
@@ -65,7 +65,8 @@ RTCCNTL:
 
 RTCIO:
   _strip:
-    - RTCIO_
+    - RTC_GPIO_
+    - RTC_IO_
 
 SENS:
   _strip:
diff --git a/svd/patches/_rtcio.yaml b/svd/patches/_rtcio.yaml
@@ -0,0 +1,4 @@
+RTCIO:
+  _array:
+    PIN*: {}
+
diff --git a/svd/patches/esp32.yaml b/svd/patches/esp32.yaml
@@ -5,6 +5,8 @@ _include:
   - "_aes.yaml"
   - "_uart.yaml"
   - "_io_mux.yaml"
+  - "_gpio.yaml"
+  - "_rtcio.yaml"
   - "_rename_registers.yaml"
   - "_rename_bitfields.yaml"
   - "_rtc_cntl.yaml"

-Original file line number
+Diff line change
 RTCIO:
   _strip:
 -    - RTCIO_
 +    - RTC_GPIO_
 +    - RTC_IO_
 SENS:
   _strip: