uint16_t to tidy usb string

DeqingSun · DeqingSun · commit 1dff8c029118 · 2020-12-14T21:43:34.000-05:00
diff --git a/ch55xduino/ch55x/cores/ch55xduino/USBconstant.c b/ch55xduino/ch55x/cores/ch55xduino/USBconstant.c
@@ -42,28 +42,26 @@ __code uint16_t CfgDescLen = sizeof(CfgDesc);
 //String Descriptors
 __code uint8_t LangDes[]={0x04,0x03,0x09,0x04};           //Language Descriptor
 __code uint16_t LangDesLen = sizeof(LangDes);
-__code uint8_t SerDes[]={                                 //Serial String Descriptor
-    0x0C,0x03,
-    'C',0x00,'H',0x00,'5',0x00,'5',0x00,'x',0x00
+__code uint16_t SerDes[]={                                 //Serial String Descriptor
+    0x030C,
+    'C','H','5','5','x',
 };
 __code uint16_t SerDesLen = sizeof(SerDes);
-__code uint8_t Prod_Des[]={                                //Produce String Descriptor
-    0x16,0x03,
-    'C',0x00,'H',0x00,'5',0x00,'5',0x00,'x',0x00,'d',0x00,
-    'u',0x00,'i',0x00,'n',0x00,'o',0x00
+__code uint16_t Prod_Des[]={                                //Produce String Descriptor
+    0x0316,
+    'C','H','5','5','x','d','u','i','n','o',
 };
 __code uint16_t Prod_DesLen = sizeof(Prod_Des);
 
-__code uint8_t CDC_Des[]={                            
-    0x16,0x03,
-    'C',0x00,'D',0x00,'C',0x00,' ',0x00,'S',0x00,'e',0x00,
-    'r',0x00,'i',0x00,'a',0x00,'l',0x00
+__code uint16_t CDC_Des[]={
+    0x0316,
+    'C','D','C',' ','S','e','r','i','a','l',
 };
 __code uint16_t CDC_DesLen = sizeof(CDC_Des);
 
-__code uint8_t Manuf_Des[]={
-    0x0E,0x03,
-    'D',0x00,'e',0x00,'q',0x00,'i',0x00,'n',0x00,'g',0x00,
+__code uint16_t Manuf_Des[]={    //SDCC is little endian
+    0x030E,
+    'D','e','q','i','n','g',
 };
 __code uint16_t Manuf_DesLen = sizeof(Manuf_Des);
 
diff --git a/ch55xduino/ch55x/cores/ch55xduino/USBconstant.h b/ch55xduino/ch55x/cores/ch55xduino/USBconstant.h
@@ -13,11 +13,10 @@
 extern __code uint8_t DevDesc[];
 extern __code uint8_t CfgDesc[];
 extern __code uint8_t LangDes[];
-extern __code uint8_t SerDes[];
-extern __code uint8_t Prod_Des[];
-extern __code uint8_t CDC_Des[];
-extern __code uint8_t WEBUSB_Des[];
-extern __code uint8_t Manuf_Des[];
+extern __code uint16_t SerDes[];
+extern __code uint16_t Prod_Des[];
+extern __code uint16_t CDC_Des[];
+extern __code uint16_t Manuf_Des[];
 
 
 
diff --git a/ch55xduino/ch55x/cores/ch55xduino/USBhandler.c b/ch55xduino/ch55x/cores/ch55xduino/USBhandler.c
@@ -96,27 +96,27 @@ void USB_EP0_SETUP(){
                         }
                         else if(UsbSetupBuf->wValueL == 1)
                         {
-                            pDescr = Manuf_Des;
+                            pDescr = (__code uint8_t *)Manuf_Des;
                             len = Manuf_DesLen;
                         }
                         else if(UsbSetupBuf->wValueL == 2)
                         {
-                            pDescr = Prod_Des;
+                            pDescr = (__code uint8_t *)Prod_Des;
                             len = Prod_DesLen;
                         }
                         else if(UsbSetupBuf->wValueL == 3)
                         {
-                            pDescr = SerDes;
+                            pDescr = (__code uint8_t *)SerDes;
                             len = SerDesLen;
                         }
                         else if(UsbSetupBuf->wValueL == 4)
                         {
-                            pDescr = CDC_Des;
+                            pDescr = (__code uint8_t *)CDC_Des;
                             len = CDC_DesLen;
                         }
                         else
                         {
-                            pDescr = SerDes;
+                            pDescr = (__code uint8_t *)SerDes;
                             len = SerDesLen;
                         }
                         break;

Original file line number	Diff line number	Diff line change
`@@ -96,27 +96,27 @@ void USB_EP0_SETUP(){`
`96`	`96`	`}`
`97`	`97`	`else if(UsbSetupBuf->wValueL == 1)`
`98`	`98`	`{`
`99`		`- pDescr = Manuf_Des;`
	`99`	`+ pDescr = (__code uint8_t *)Manuf_Des;`
`100`	`100`	`len = Manuf_DesLen;`
`101`	`101`	`}`
`102`	`102`	`else if(UsbSetupBuf->wValueL == 2)`
`103`	`103`	`{`
`104`		`- pDescr = Prod_Des;`
	`104`	`+ pDescr = (__code uint8_t *)Prod_Des;`
`105`	`105`	`len = Prod_DesLen;`
`106`	`106`	`}`
`107`	`107`	`else if(UsbSetupBuf->wValueL == 3)`
`108`	`108`	`{`
`109`		`- pDescr = SerDes;`
	`109`	`+ pDescr = (__code uint8_t *)SerDes;`
`110`	`110`	`len = SerDesLen;`
`111`	`111`	`}`
`112`	`112`	`else if(UsbSetupBuf->wValueL == 4)`
`113`	`113`	`{`
`114`		`- pDescr = CDC_Des;`
	`114`	`+ pDescr = (__code uint8_t *)CDC_Des;`
`115`	`115`	`len = CDC_DesLen;`
`116`	`116`	`}`
`117`	`117`	`else`
`118`	`118`	`{`
`119`		`- pDescr = SerDes;`
	`119`	`+ pDescr = (__code uint8_t *)SerDes;`
`120`	`120`	`len = SerDesLen;`
`121`	`121`	`}`
`122`	`122`	`break;`