usb: Revert usage of uchar.h

src/chipset/ali1543.c

@@ -20,7 +20,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <wchar.h>
-#include <uchar.h>
 #define HAVE_STDARG_H
 #include <86box/86box.h>
 #include <86box/timer.h>

src/chipset/intel_piix.c

@@ -23,7 +23,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <wchar.h>
-#include <uchar.h>
 #define HAVE_STDARG_H
 #include <86box/86box.h>
 #include "cpu.h"

src/chipset/sis_5571.c

@@ -20,7 +20,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <wchar.h>
-#include <uchar.h>
 #define HAVE_STDARG_H
 #include <86box/86box.h>
 #include <86box/device.h>

src/chipset/stpc.c

@@ -20,7 +20,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <wchar.h>
-#include <uchar.h>
 #define HAVE_STDARG_H
 #include <86box/86box.h>
 #include <86box/mem.h>

src/chipset/via_pipc.c

@@ -26,7 +26,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <wchar.h>
-#include <uchar.h>
 #define HAVE_STDARG_H
 #include <86box/86box.h>
 #include "cpu.h"

src/include/86box/usb.h

@@ -92,6 +92,18 @@ typedef struct
     uint8_t bDescriptorType;
 } usb_desc_base_t;
 
+enum usb_desc_setup_req_types
+{
+    USB_SETUP_TYPE_DEVICE = 0x0,
+    USB_SETUP_TYPE_INTERFACE = 0x1,
+    USB_SETUP_TYPE_ENDPOING = 0x2,
+    USB_SETUP_TYPE_OTHER = 0x3,
+};
+
+#define USB_SETUP_TYPE_MAX 0x1F
+
+#define USB_SETUP_DEV_TO_HOST 0x80
+
 typedef struct
 {
     uint8_t bmRequestType;
@@ -137,7 +149,7 @@ typedef struct
 typedef struct
 {
     usb_desc_base_t base;
-    char16_t bString[];
+    uint16_t bString[];
 } usb_desc_string_t;
 
 typedef struct

src/usb.c

@@ -22,7 +22,6 @@
 #include <string.h>
 #include <stdbool.h>
 #include <wchar.h>
-#include <uchar.h>
 #include <assert.h>
 #define HAVE_STDARG_H
 #include <86box/86box.h>