Merge pull request #658 from monte-monte/master

Fix unbrick. Enhance prints for b003boot init.

Author: cnlohr

minichlink/minichlink.c

@@ -3025,6 +3025,7 @@ int DefaultPollTerminal( void * dev, uint8_t * buffer, int maxlen, uint32_t leav
 
 int DefaultUnbrick( void * dev )
 {
+	if( MCF.ResetInterface) MCF.ResetInterface( dev );
 	printf( "Entering Unbrick Mode\n" );
 	if( MCF.Control5v ) MCF.Control5v( dev, 0 );
 	MCF.Control3v3( dev, 0 );
@@ -3039,7 +3040,7 @@ int DefaultUnbrick( void * dev )
 	MCF.FlushLLCommands( dev );
 
 	int timeout = 0;
-	int max_timeout = 50000; // An absurdly long time.
+	int max_timeout = 500; // An absurdly long time.
 	uint32_t ds = 0;
 	for( timeout = 0; timeout < max_timeout; timeout++ )
 	{
@@ -3059,6 +3060,7 @@ int DefaultUnbrick( void * dev )
 		}
 		MCF.FlushLLCommands( dev );
 		if( ds != 0xffffffff && ds != 0x00000000 ) break;
+		else fprintf( stderr, "%08x\n", ds );
 	}
 
 	if( timeout == max_timeout ) 

minichlink/minichlink.exe

@@ -81,9 +81,10 @@ struct MiniChlinkFunctions
 
 	int (*WriteByte)( void * dev, uint32_t address_to_write, uint8_t data );
 	int (*ReadByte)( void * dev, uint32_t address_to_read, uint8_t * data );
-  int (*GetUUID)( void * dev, uint8_t * buffer );
-  int (*SetClock)( void * dev, uint32_t clock );
-  int (*EnableDebug)( void * dev, uint8_t disable );
+	int (*GetUUID)( void * dev, uint8_t * buffer );
+	int (*SetClock)( void * dev, uint32_t clock );
+	int (*EnableDebug)( void * dev, uint8_t disable );
+	int (*ResetInterface)( void * dev );
 };
 
 /** If you are writing a driver, the minimal number of functions you can implement are:

minichlink/minichlink.h

@@ -460,11 +460,30 @@ static int B003FunSetupInterface( void * dev )
 	struct InternalState * iss = (struct InternalState*)(((struct B003FunProgrammerStruct*)eps)->internal);
 	iss->target_chip = &ch32v003;
 	iss->target_chip_type = CHIP_CH32V003;
-	iss->flash_size = 16*1024;
+	iss->flash_size = 16;
+	iss->ram_base = iss->target_chip->ram_base;
+	iss->ram_size = iss->target_chip->ram_size;
+	iss->sector_size = iss->target_chip->sector_size;
 	printf( "Halting Boot Countdown\n" );
 	ResetOp( eps );
 	WriteOpArb( eps, halt_wait_blob, sizeof(halt_wait_blob) );
 	if( CommitOp( eps ) ) return -5;
+	
+	uint32_t one;
+	int two;
+	uint8_t read_protection;
+	MCF.ReadWord( dev, 0x4002201c, &one );
+	MCF.ReadWord( dev, 0x40022020, (uint32_t*)&two );
+	
+	if( (one & 2) || two != -1 ) read_protection = 1;
+
+	uint8_t uuid[8];
+	fprintf( stderr, "Detected %s\n", iss->target_chip->name_str );
+	fprintf( stderr, "Flash Storage: %d kB\n", iss->flash_size );
+	if( MCF.GetUUID( dev, uuid ) ) fprintf( stderr, "Couldn't read UUID\n" );
+	else fprintf( stderr, "Part UUID: %02x-%02x-%02x-%02x-%02x-%02x-%02x-%02x\n", uuid[0], uuid[1], uuid[2], uuid[3], uuid[4], uuid[5], uuid[6], uuid[7] );
+	// fprintf( stderr, "Part Type: %02x-%02x-%02x-%02x\n", part_type[3], part_type[2], part_type[1], part_type[0] );
+	fprintf( stderr, "Read protection: %s\n", (read_protection > 0)?"enabled":"disabled" );
 	return 0;
 }
 
@@ -638,6 +657,19 @@ int B003PollTerminal( void * dev, uint8_t * buffer, int maxlen, uint32_t leavefl
 	}
 }
 
+static int B003FunGetUUID(void * dev, uint8_t * buffer)
+{
+	int ret = 0;
+	uint8_t local_buffer[8] = {0, 0, 0, 0, 0, 0, 0, 0};
+
+	ret |= MCF.ReadWord( dev, 0x1ffff7e8, (uint32_t*)local_buffer );			
+	ret |= MCF.ReadWord( dev, 0x1ffff7ec, (uint32_t*)(local_buffer + 4) );
+	
+	*((uint32_t*)buffer) = local_buffer[0]<<24|local_buffer[1]<<16|local_buffer[2]<<8|local_buffer[3];
+	*(((uint32_t*)buffer)+1) = local_buffer[4]<<24|local_buffer[5]<<16|local_buffer[6]<<8|local_buffer[7];
+	return ret;
+}
+
 void * TryInit_B003Fun(uint32_t id)
 {
 	hid_init();
@@ -705,6 +737,8 @@ void * TryInit_B003Fun(uint32_t id)
 
 	MCF.HaltMode = B003FunHaltMode;
 
+	MCF.GetUUID = B003FunGetUUID;
+
 	return eps;
 }
 

minichlink/pgm-b003fun.c

@@ -292,6 +292,14 @@ int LEFlushLLCommands( void * dev )
 	return 0;
 }
 
+int LEResetInterface( void * d )
+{
+	libusb_device_handle * dev = ((struct LinkEProgrammerStruct*)d)->devh;
+	wch_link_command( dev, "\x81\x0d\x01\xff", 4, 0, 0, 0 );
+	wch_link_command( dev, "\x81\x0d\x01\x01", 4, 0, 0, 0 );
+	return 0;
+}
+
 static int LESetupInterface( void * d )
 {
 	libusb_device_handle * dev = ((struct LinkEProgrammerStruct*)d)->devh;
@@ -627,6 +635,7 @@ void * TryInit_WCHLinkE()
 	MCF.WriteReg32 = LEWriteReg32;
 	MCF.FlushLLCommands = LEFlushLLCommands;
 
+	MCF.ResetInterface = LEResetInterface;
 	MCF.SetupInterface = LESetupInterface;
 	MCF.Control3v3 = LEControl3v3;
 	MCF.Control5v = LEControl5v;
@@ -1040,5 +1049,3 @@ static int LEWriteBinaryBlob( void * d, uint32_t address_to_write, uint32_t len,
 
 	return 0;
 }
-
-