Merge remote-tracking branch 'cnlohr/master' into other-chip-support

cnlohr · Jan 8, 2024 · a7462c4 · a7462c4
2 parents 452e299 + 7e66742
commit a7462c4
Show file tree

Hide file tree

Showing 5 changed files with 50 additions and 14 deletions.
diff --git a/ch32v003fun/ch32v003fun.c b/ch32v003fun/ch32v003fun.c
@@ -1252,7 +1252,7 @@ int putchar(int c)
 void handle_debug_input( int numbytes, uint8_t * data ) __attribute__((weak));
 void handle_debug_input( int numbytes, uint8_t * data ) { }
 
-static void internal_handle_input( uint32_t * dmdata0 )
+static void internal_handle_input( volatile uint32_t * dmdata0 )
 {
 	uint32_t dmd0 = *dmdata0;
 	int bytes = (dmd0 & 0x3f) - 4;
@@ -1265,11 +1265,12 @@ static void internal_handle_input( uint32_t * dmdata0 )
 
 void poll_input()
 {
-	uint32_t lastdmd = (*DMDATA0);
- 	if( !(lastdmd & 0x80) )
+	volatile uint32_t * dmdata0 = (volatile uint32_t *)DMDATA0;
+ 	if( ((*dmdata0) & 0x80) == 0 )
 	{
-		internal_handle_input( (uint32_t*)DMDATA0 );
-		*DMDATA0 = 0x84; // Negative
+		internal_handle_input( dmdata0 );
+		// Should be 0x80 or so, but for some reason there's a bug that retriggers.
+		*dmdata0 = 0x00;
 	}
 }
 
@@ -1337,10 +1338,6 @@ int putchar(int c)
 		if( timeout-- == 0 ) return 0;
 
 	// Simply seeking input.
-	lastdmd = (*DMDATA0);
-	if( lastdmd ) internal_handle_input( (uint32_t*)DMDATA0 );
-
-	while( (lastdmd = (*DMDATA0)) & 0x80 ) if( timeout-- == 0 ) return 0;
 	if( lastdmd ) internal_handle_input( (uint32_t*)DMDATA0 );
 	*DMDATA0 = 0x85 | ((const char)c<<8);
 	return 1;

diff --git a/ch32v003fun/ch32v003fun.h b/ch32v003fun/ch32v003fun.h
@@ -11519,6 +11519,45 @@ RV_STATIC_INLINE void __disable_irq()
   __asm volatile ("csrw mstatus, %0" : : "r" (result) );
 }
 
+/*********************************************************************
+ * @fn      __isenabled_irq
+ *
+ * @brief   Is Global Interrupt enabled
+ *
+ * @return  1: yes, 0: no
+ */
+RV_STATIC_INLINE uint8_t __isenabled_irq(void)
+{
+    uint32_t result;
+
+    __asm volatile(
+#if __GNUC__ > 10
+    ".option arch, +zicsr\n"
+#endif
+    "csrr %0," "mstatus": "=r"(result));
+    return (result & 0x08) != 0u;
+}
+
+/*********************************************************************
+ * @fn      __get_cpu_sp
+ *
+ * @brief   Get stack pointer
+ *
+ * @return  stack pointer
+ */
+RV_STATIC_INLINE uint32_t __get_cpu_sp(void);
+RV_STATIC_INLINE uint32_t __get_cpu_sp(void)
+{
+  uint32_t result;
+
+  __asm volatile(
+#if __GNUC__ > 10
+    ".option arch, +zicsr\n"
+#endif
+  "mv %0, sp" : "=r"(result));
+  return result;
+}
+
 /*********************************************************************
  * @fn      __NOP
  *

diff --git a/examples/direct_gpio/direct_gpio.c b/examples/direct_gpio/direct_gpio.c
@@ -1,8 +1,6 @@
 #include "ch32v003fun.h"
 #include <stdio.h>
 
-uint32_t count;
-
 int main()
 {
 	SystemInit();
@@ -41,7 +39,6 @@ int main()
 		GPIOC->OUTDR &= ~(1<<(4)); // CLEAR GPIO C4
 
 		Delay_Ms( 50 );
-		count++;
 	}
 }
 
diff --git a/minichlink/99-minichlink.rules b/minichlink/99-minichlink.rules
@@ -1,4 +1,6 @@
 SUBSYSTEM=="usb", ATTRS{idVendor}=="1a86", ATTRS{idProduct}=="8010", GROUP="plugdev", MODE="0660"
 SUBSYSTEM=="usb", ATTRS{idVendor}=="303a", ATTRS{idProduct}=="4004", GROUP="plugdev", MODE="0660"
 KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="303a", ATTRS{idProduct}=="4004", GROUP="plugdev", MODE="0660"
-
+# rv003usb bootloader
+KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1209", ATTRS{idProduct}=="b003", GROUP="plugdev", MODE="0660"
+#KERNEL=="hiddev*", SUBSYSTEM=="usbmisc", ATTRS{idVendor}=="1209", ATTRS{idProduct}=="b003", GROUP="plugdev", MODE="0660"
diff --git a/minichlink/minichlink.c b/minichlink/minichlink.c
@@ -114,7 +114,7 @@ int main( int argc, char ** argv )
 			if( i < argc )
 				hints.serial_port = argv[i];
 		}
-		else if( strncmp( v, "-c", 2 ) == 0 )
+		else if( strncmp( v, "-C", 2 ) == 0 )
 		{
 			i++;
 			if( i < argc )
@@ -649,6 +649,7 @@ int main( int argc, char ** argv )
 	fprintf( stderr, " -t Disable 3.3V\n" );
 	fprintf( stderr, " -f Disable 5V\n" );
 	fprintf( stderr, " -c [serial port for Ardulink, try /dev/ttyACM0 or COM11 etc]\n" );
+	fprintf( stderr, " -C [specified programmer, eg. b003boot, ardulink, esp32s2chfun]\n" );
 	fprintf( stderr, " -u Clear all code flash - by power off (also can unbrick)\n" );
 	fprintf( stderr, " -E Erase chip\n" );
 	fprintf( stderr, " -b Reboot out of Halt\n" );