Reordered mpconfigport.mk; replaced MXC_SYS includes with max32_port.h in microcontroller/Pin.c

Author: Brandon-Hurst

ports/analog/Makefile

@@ -147,6 +147,8 @@ CFLAGS += -D$(MCU_VARIANT_UPPER) \
 			-DTARGET=$(MCU_VARIANT_UPPER) \
 			-DIAR_PRAGMAS=0 \
 			-DRISCV_LOAD=0
+
+# todo: add these for linkerfiles later on so that it's easier to add new boards
 # -DFLASH_ORIGIN=0x10000000 \
 # -DFLASH_SIZE=0x340000 \
 # -DSRAM_ORIGIN=0x20000000 \
@@ -193,7 +195,9 @@ SRC_C += \
 
 CFLAGS += $(INC) -Werror -Wall -std=gnu11 -nostartfiles $(BASE_CFLAGS) $(COPT)
 
-# Suppress some warnings for MSDK
+# Suppress some errors for MSDK
+# 	cast-align warning will be suppressed;
+# 	it gets generated by CircuitPy's TLSF memory allocator lib
 CFLAGS += -Wno-error=unused-parameter \
 			-Wno-error=old-style-declaration \
 			-Wno-error=sign-compare \
@@ -203,7 +207,8 @@ CFLAGS += -Wno-error=unused-parameter \
 			-Wno-error=lto-type-mismatch \
 			-Wno-error=cast-align \
 			-Wno-error=nested-externs \
-			-Wno-error=sign-compare
+			-Wno-error=sign-compare \
+			-Wno-cast-align \
 
 ENTRY = Reset_Handler
 LDFLAGS += $(CFLAGS) --entry $(ENTRY) -Wl,-nostdlib -Wl,-T,$(LINKERFILE) -Wl,-Map=$@.map -Wl,-cref -Wl,-gc-sections

ports/analog/common-hal/digitalio/DigitalInOut.c

@@ -4,6 +4,7 @@
 //
 // SPDX-License-Identifier: MIT
 
+#define CIRCUITPY_DIGITALIO_HAVE_INVALID_DRIVE_MODE 1
 #include "shared-bindings/digitalio/DigitalInOut.h"
 #include "shared-bindings/microcontroller/Pin.h"
 
@@ -70,9 +71,9 @@ digitalinout_result_t common_hal_digitalio_digitalinout_switch_to_output(
 
     // todo (low): MSDK Hardware does not support open-drain configuration except
     // todo (low): when directly managed by a peripheral such as I2C.
-    // todo (low): find a way to signal this perhaps to any upstream code
+    // todo (low): find a way to signal this to any upstream code
     if (drive_mode != DRIVE_MODE_PUSH_PULL) {
-        return DIGITALINOUT_OK;
+        return DIGITALINOUT_INVALID_DRIVE_MODE;
     }
     return DIGITALINOUT_OK;
 }

ports/analog/common-hal/microcontroller/Pin.c

@@ -10,9 +10,7 @@
 #include "mpconfigboard.h"
 #include "pins.h"
 
-#include "mxc_sys.h"
-#include "gpio.h"
-#include "gpio_regs.h"
+#include "max32_port.h"
 
 #include "common-hal/microcontroller/Pin.h"
 
@@ -79,7 +77,7 @@ uint8_t common_hal_mcu_pin_number(const mcu_pin_obj_t *pin) {
     }
 
     // most max32 gpio ports have 32 pins
-    // todo: create a struct to encode # of pins for each port, since some GPIO ports differ
+    // todo (low prior.): encode # of pins for each port, since some GPIO ports differ
     return pin->port * 32 + pin->mask;
 }
 

ports/analog/mpconfigport.mk

@@ -21,9 +21,6 @@ INTERNAL_FLASH_FILESYSTEM = 1
 ####################################################################################
 # These modules are implemented in ports/<port>/common-hal:
 
-# Typically the second module to create
-CIRCUITPY_DIGITALIO ?= 1
-
 # Plan to implement
 CIRCUITPY_BUSIO ?= 0
 CIRCUITPY_RTC ?= 0
@@ -47,21 +44,20 @@ CIRCUITPY_DISPLAYIO ?= 0
 
 # These modules are implemented in shared-module/ - they can be included in
 # any port once their prerequisites in common-hal are complete.
+# No requirements, but takes extra flash
+CIRCUITPY_ULAB = 1
 # Requires DigitalIO:
-CIRCUITPY_BITBANGIO ?= 0
-# Requires neopixel_write or SPI (dotstar)
-CIRCUITPY_PIXELBUF ?= 0
+CIRCUITPY_BITBANGIO ?= 1
+# Requires Microcontroller
+CIRCUITPY_TOUCHIO ?= 1
 # Requires OS
 CIRCUITPY_RANDOM ?= 0
-# Requires Microcontroller
-CIRCUITPY_TOUCHIO ?= 0
-# Requires UART
+# Requires busio.UART
 CIRCUITPY_CONSOLE_UART ?= 0
 # Does nothing without I2C
 CIRCUITPY_REQUIRE_I2C_PULLUPS = 0
-
-# No requirements, but takes extra flash
-CIRCUITPY_ULAB = 1
+# Requires neopixel_write or SPI (dotstar)
+CIRCUITPY_PIXELBUF ?= 0
 
 ####################################################################################
 # Required for clean building (additional CircuittPython Defaults)

ports/analog/peripherals/led.h

@@ -187,7 +187,7 @@ mp_uint_t supervisor_flash_write_blocks(const uint8_t *src, uint32_t block_num,
     uint32_t error, blocks_left, count, page_start, page_size = 0;
 
     while (num_blocks > 0) {
-        uint32_t dest_addr = block2addr(block_num);
+        int dest_addr = block2addr(block_num);
         // bad block number passed in
         if (dest_addr == -1) {
             return 1;

ports/analog/supervisor/internal_flash.c

@@ -37,9 +37,6 @@
 #include "common-hal/microcontroller/Pin.h"
 #include "shared-bindings/microcontroller/__init__.h"
 
-//todo: pack the below definitions into their own module
-//todo: under peripherals/gpio, peripherals/clocks, etc.
-
 // Sys includes
 #include "max32_port.h"
 
@@ -62,9 +59,6 @@ extern const int num_pbs;
 extern const mxc_gpio_cfg_t led_pin[];
 extern const int num_leds;
 
-//todo: define an LED HAL
-// #include "peripherals/led.h"
-
 // For saving rtc data for ticks
 static uint32_t subsec, sec = 0;
 static uint32_t tick_flag = 0;