update version to v2.1.0

2026-05-21 01:12:01 +00:00 · 2023-08-08 19:29:14 +08:00
parent 704a2ff779
commit fb61391d00
363 changed files with 144902 additions and 1210 deletions
--- a/middlewares/usbd_class/audio/audio_class.c
+++ b/middlewares/usbd_class/audio/audio_class.c
@@ -197,8 +197,12 @@ static usb_sts_type class_setup_handler(void *udev, usb_setup_type *setup)
          audio_set_interface(udev, setup);
          usbd_ctrl_send_status(pudev);
          break;
-
+        case USB_STD_REQ_CLEAR_FEATURE:
+          break;
+        case USB_STD_REQ_SET_FEATURE:
+          break;
        default:
+          usbd_ctrl_unsupport(pudev);
          break;
      }
      break;
--- a/middlewares/usbd_class/audio/audio_desc.c
+++ b/middlewares/usbd_class/audio/audio_desc.c
@@ -52,7 +52,10 @@ static usbd_desc_t *get_device_config_string(void);
 static uint16_t usbd_unicode_convert(uint8_t *string, uint8_t *unicode_buf);
 static void usbd_int_to_unicode (uint32_t value , uint8_t *pbuf , uint8_t len);
 static void get_serial_num(void);
-static uint8_t g_usbd_desc_buffer[256];
+#if defined ( __ICCARM__ ) /* iar compiler */
+  #pragma data_alignment=4
+#endif
+ALIGNED_HEAD static uint8_t g_usbd_desc_buffer[256] ALIGNED_TAIL;

 /**
  * @brief device descriptor handler structure
--- a/middlewares/usbd_class/audio_hid/audio_hid_class.c
+++ b/middlewares/usbd_class/audio_hid/audio_hid_class.c
@@ -216,7 +216,12 @@ usb_sts_type class_audio_setup_handler(void *udev, usb_setup_type *setup)
          usbd_ctrl_send_status(pudev);
          break;

+        case USB_STD_REQ_CLEAR_FEATURE:
+          break;
+        case USB_STD_REQ_SET_FEATURE:
+          break;
        default:
+          usbd_ctrl_unsupport(pudev);
          break;
      }
      break;
@@ -293,7 +298,12 @@ usb_sts_type class_hid_setup_handler(void *udev, usb_setup_type *setup)
        case USB_STD_REQ_SET_INTERFACE:
          paudio_hid->alt_setting = setup->wValue;
          break;
+        case USB_STD_REQ_CLEAR_FEATURE:
+          break;
+        case USB_STD_REQ_SET_FEATURE:
+          break;
        default:
+          usbd_ctrl_unsupport(pudev);
          break;
      }
      break;
--- a/middlewares/usbd_class/audio_hid/audio_hid_desc.c
+++ b/middlewares/usbd_class/audio_hid/audio_hid_desc.c
@@ -54,7 +54,10 @@ static usbd_desc_t *get_device_config_string(void);
 static uint16_t usbd_unicode_convert(uint8_t *string, uint8_t *unicode_buf);
 static void usbd_int_to_unicode (uint32_t value , uint8_t *pbuf , uint8_t len);
 static void get_serial_num(void);
-static uint8_t g_usbd_desc_buffer[256];
+#if defined ( __ICCARM__ ) /* iar compiler */
+  #pragma data_alignment=4
+#endif
+ALIGNED_HEAD static uint8_t g_usbd_desc_buffer[256] ALIGNED_TAIL;

 /**
  * @brief device descriptor handler structure
@@ -373,7 +376,7 @@ ALIGNED_HEAD static uint8_t g_usbd_configuration[USBD_AUHID_CONFIG_DESC_SIZE] AL
  0x11,                                  /* bmAttributes: endpoint attributes */
  LBYTE(AUDIO_FEEDBACK_MAXPACKET_SIZE),  /* wMaxPacketSize: maximum packe size this endpoint */
  HBYTE(AUDIO_FEEDBACK_MAXPACKET_SIZE),  /* wMaxPacketSize: maximum packe size this endpoint */
-  1,                   					 /* bInterval: interval for polling endpoint for data transfers */
+  1,                              /* bInterval: interval for polling endpoint for data transfers */
  FEEDBACK_REFRESH_TIME,                 /* bRefresh: this field indicates the rate at which an iso syncronization
                                                      pipe provides new syncronization feedback data. this rate must be a power of
                                                      2, therefore only the power is reported back and the range of this field is from
--- a/middlewares/usbd_class/cdc/cdc_class.c
+++ b/middlewares/usbd_class/cdc/cdc_class.c
@@ -180,7 +180,12 @@ static usb_sts_type class_setup_handler(void *udev, usb_setup_type *setup)
        case USB_STD_REQ_SET_INTERFACE:
          pcdc->alt_setting = setup->wValue;
          break;
+        case USB_STD_REQ_CLEAR_FEATURE:
+          break;
+        case USB_STD_REQ_SET_FEATURE:
+          break;
        default:
+          usbd_ctrl_unsupport(pudev);
          break;
      }
      break;
--- a/middlewares/usbd_class/cdc/cdc_desc.c
+++ b/middlewares/usbd_class/cdc/cdc_desc.c
@@ -53,7 +53,10 @@ static usbd_desc_t *get_device_config_string(void);
 static uint16_t usbd_unicode_convert(uint8_t *string, uint8_t *unicode_buf);
 static void usbd_int_to_unicode (uint32_t value , uint8_t *pbuf , uint8_t len);
 static void get_serial_num(void);
-static uint8_t g_usbd_desc_buffer[256];
+#if defined ( __ICCARM__ ) /* iar compiler */
+  #pragma data_alignment=4
+#endif
+ALIGNED_HEAD static uint8_t g_usbd_desc_buffer[256] ALIGNED_TAIL;

 /**
  * @brief device descriptor handler structure
--- a/middlewares/usbd_class/composite_cdc_keyboard/cdc_keyboard_class.c
+++ b/middlewares/usbd_class/composite_cdc_keyboard/cdc_keyboard_class.c
@@ -66,8 +66,8 @@ const static unsigned char _asciimap[128] =
  0x00,// ACK
  0x00,// BEL
  0x2A,// BS Backspace
-  0x2B,// TAB	Tab
-  0x28,// LF	Enter
+  0x2B,// TAB  Tab
+  0x28,// LF  Enter
  0x00,// VT
  0x00,// FF
  0x00,// CR
@@ -185,7 +185,7 @@ const static unsigned char _asciimap[128] =
  0x31|SHIFT,// |
  0x30|SHIFT,// }
  0x35|SHIFT,// ~
-  0	// DEL
+  0  // DEL
 };

 linecoding_type linecoding_vcpkybrd =
@@ -356,7 +356,12 @@ static usb_sts_type cdc_class_setup_handler(void *udev, usb_setup_type *setup)
        case USB_STD_REQ_SET_INTERFACE:
          vcpkybrd->alt_setting = setup->wValue;
          break;
+        case USB_STD_REQ_CLEAR_FEATURE:
+          break;
+        case USB_STD_REQ_SET_FEATURE:
+          break;
        default:
+          usbd_ctrl_unsupport(pudev);
          break;
      }
      break;
@@ -431,7 +436,12 @@ static usb_sts_type keyboard_class_setup_handler(void *udev, usb_setup_type *set
        case USB_STD_REQ_SET_INTERFACE:
          vcpkybrd->alt_setting = setup->wValue;
          break;
+        case USB_STD_REQ_CLEAR_FEATURE:
+          break;
+        case USB_STD_REQ_SET_FEATURE:
+          break;
        default:
+          usbd_ctrl_unsupport(pudev);
          break;
      }
      break;
--- a/middlewares/usbd_class/composite_cdc_keyboard/cdc_keyboard_desc.c
+++ b/middlewares/usbd_class/composite_cdc_keyboard/cdc_keyboard_desc.c
@@ -52,7 +52,10 @@ static usbd_desc_t *get_device_config_string(void);
 static uint16_t usbd_unicode_convert(uint8_t *string, uint8_t *unicode_buf);
 static void usbd_int_to_unicode (uint32_t value , uint8_t *pbuf , uint8_t len);
 static void get_serial_num(void);
-static uint8_t g_usbd_desc_buffer[256];
+#if defined ( __ICCARM__ ) /* iar compiler */
+  #pragma data_alignment=4
+#endif
+ALIGNED_HEAD static uint8_t g_usbd_desc_buffer[256] ALIGNED_TAIL;

 /**
  * @brief device descriptor handler structure
--- a/middlewares/usbd_class/composite_cdc_msc/cdc_msc_class.c
+++ b/middlewares/usbd_class/composite_cdc_msc/cdc_msc_class.c
@@ -227,7 +227,12 @@ static usb_sts_type cdc_class_setup_handler(void *udev, usb_setup_type *setup)
        case USB_STD_REQ_SET_INTERFACE:
          pcdc->alt_setting = setup->wValue;
          break;
+        case USB_STD_REQ_CLEAR_FEATURE:
+          break;
+        case USB_STD_REQ_SET_FEATURE:
+          break;
        default:
+          usbd_ctrl_unsupport(pudev);
          break;
      }
      break;
@@ -296,7 +301,10 @@ static usb_sts_type msc_class_setup_handler(void *udev, usb_setup_type *setup)
          }
          bot_scsi_clear_feature(udev, setup->wIndex);
          break;
+        case USB_STD_REQ_SET_FEATURE:
+          break;
        default:
+          usbd_ctrl_unsupport(pudev);
          break;
      }
      break;
--- a/middlewares/usbd_class/composite_cdc_msc/cdc_msc_class.h
+++ b/middlewares/usbd_class/composite_cdc_msc/cdc_msc_class.h
@@ -266,7 +266,7 @@ typedef struct
  uint32_t blk_nbr[MSC_SUPPORT_MAX_LUN];
  uint32_t blk_size[MSC_SUPPORT_MAX_LUN];
  
-  uint32_t blk_addr;
+  uint64_t blk_addr;
  uint32_t blk_len;
  
  uint32_t data_len;
--- a/middlewares/usbd_class/composite_cdc_msc/cdc_msc_desc.c
+++ b/middlewares/usbd_class/composite_cdc_msc/cdc_msc_desc.c
@@ -56,7 +56,10 @@ static usbd_desc_t *get_device_config_string(void);
 static uint16_t usbd_unicode_convert(uint8_t *string, uint8_t *unicode_buf);
 static void usbd_int_to_unicode (uint32_t value , uint8_t *pbuf , uint8_t len);
 static void get_serial_num(void);
-static uint8_t g_usbd_desc_buffer[256];
+#if defined ( __ICCARM__ ) /* iar compiler */
+  #pragma data_alignment=4
+#endif
+ALIGNED_HEAD static uint8_t g_usbd_desc_buffer[256] ALIGNED_TAIL;

 /**
  * @brief device descriptor handler structure
--- a/middlewares/usbd_class/composite_cdc_msc/msc_bot_scsi.c
+++ b/middlewares/usbd_class/composite_cdc_msc/msc_bot_scsi.c
@@ -42,11 +42,11 @@
  #pragma data_alignment=4
 #endif
 ALIGNED_HEAD uint8_t page00_inquiry_data[] ALIGNED_TAIL = {
-	0x00,		
-	0x00, 
-	0x00, 
-	0x00,
-	0x00, 
+  0x00,    
+  0x00, 
+  0x00, 
+  0x00,
+  0x00, 

 };
 #if defined ( __ICCARM__ ) /* iar compiler */
--- a/middlewares/usbd_class/custom_hid/custom_hid_class.c
+++ b/middlewares/usbd_class/custom_hid/custom_hid_class.c
@@ -180,7 +180,12 @@ static usb_sts_type class_setup_handler(void *udev, usb_setup_type *setup)
        case USB_STD_REQ_SET_INTERFACE:
          pcshid->alt_setting = setup->wValue;
          break;
+        case USB_STD_REQ_CLEAR_FEATURE:
+          break;
+        case USB_STD_REQ_SET_FEATURE:
+          break;
        default:
+          usbd_ctrl_unsupport(pudev);
          break;
      }
      break;
--- a/middlewares/usbd_class/custom_hid/custom_hid_desc.c
+++ b/middlewares/usbd_class/custom_hid/custom_hid_desc.c
@@ -52,7 +52,10 @@ static usbd_desc_t *get_device_config_string(void);
 static uint16_t usbd_unicode_convert(uint8_t *string, uint8_t *unicode_buf);
 static void usbd_int_to_unicode (uint32_t value , uint8_t *pbuf , uint8_t len);
 static void get_serial_num(void);
-static uint8_t g_usbd_desc_buffer[256];
+#if defined ( __ICCARM__ ) /* iar compiler */
+  #pragma data_alignment=4
+#endif
+ALIGNED_HEAD static uint8_t g_usbd_desc_buffer[256] ALIGNED_TAIL;

 /**
  * @brief  custom hid device descriptor handler structure
--- a/middlewares/usbd_class/hid_iap/hid_iap_class.c
+++ b/middlewares/usbd_class/hid_iap/hid_iap_class.c
@@ -171,7 +171,12 @@ static usb_sts_type class_setup_handler(void *udev, usb_setup_type *setup)
        case USB_STD_REQ_SET_INTERFACE:
          piap->alt_setting = setup->wValue;
          break;
+        case USB_STD_REQ_CLEAR_FEATURE:
+          break;
+        case USB_STD_REQ_SET_FEATURE:
+          break;
        default:
+          usbd_ctrl_unsupport(pudev);
          break;
      }
      break;
--- a/middlewares/usbd_class/hid_iap/hid_iap_desc.c
+++ b/middlewares/usbd_class/hid_iap/hid_iap_desc.c
@@ -55,7 +55,10 @@ static usbd_desc_t *get_device_config_string(void);
 static uint16_t usbd_unicode_convert(uint8_t *string, uint8_t *unicode_buf);
 static void usbd_int_to_unicode (uint32_t value , uint8_t *pbuf , uint8_t len);
 static void get_serial_num(void);
-static uint8_t g_usbd_desc_buffer[256];
+#if defined ( __ICCARM__ ) /* iar compiler */
+  #pragma data_alignment=4
+#endif
+ALIGNED_HEAD static uint8_t g_usbd_desc_buffer[256] ALIGNED_TAIL;

 /**
  * @brief  hid device descriptor handler structure
--- a/middlewares/usbd_class/keyboard/keyboard_class.c
+++ b/middlewares/usbd_class/keyboard/keyboard_class.c
@@ -54,133 +54,133 @@ const static unsigned char _asciimap[128] =
 {
  0x00,// NUL
  0x00,// SOH
-	0x00,// STX
-	0x00,// ETX
-	0x00,// EOT
-	0x00,// ENQ
-	0x00,// ACK
-	0x00,// BEL
-	0x2A,// BS Backspace
-	0x2B,// TAB	Tab
-	0x28,// LF	Enter
-	0x00,// VT
-	0x00,// FF
-	0x00,// CR
-	0x00,// SO
-	0x00,// SI
-	0x00,// DEL
-	0x00,// DC1
-	0x00,// DC2
-	0x00,// DC3
-	0x00,// DC4
-	0x00,// NAK
-	0x00,// SYN
-	0x00,// ETB
-	0x00,// CAN
-	0x00,// EM
-	0x00,// SUB
-	0x00,// ESC
-	0x00,// FS
-	0x00,// GS
-	0x00,// RS
-	0x00,// US
+  0x00,// STX
+  0x00,// ETX
+  0x00,// EOT
+  0x00,// ENQ
+  0x00,// ACK
+  0x00,// BEL
+  0x2A,// BS Backspace
+  0x2B,// TAB  Tab
+  0x28,// LF  Enter
+  0x00,// VT
+  0x00,// FF
+  0x00,// CR
+  0x00,// SO
+  0x00,// SI
+  0x00,// DEL
+  0x00,// DC1
+  0x00,// DC2
+  0x00,// DC3
+  0x00,// DC4
+  0x00,// NAK
+  0x00,// SYN
+  0x00,// ETB
+  0x00,// CAN
+  0x00,// EM
+  0x00,// SUB
+  0x00,// ESC
+  0x00,// FS
+  0x00,// GS
+  0x00,// RS
+  0x00,// US

-	0x2C,//  ' '
-	0x1E|SHIFT,// !
-	0x34|SHIFT,// "
-	0x20|SHIFT,// #
-	0x21|SHIFT,// $
-	0x22|SHIFT,// %
-	0x24|SHIFT,// &
-	0x34,      // '
-	0x26|SHIFT,// (
-	0x27|SHIFT,// )
-	0x25|SHIFT,// *
-	0x2E|SHIFT,// +
-	0x36,// ,
-	0x2D,// -
-	0x37,// .
-	0x38,// /
-	0x27,// 0
-	0x1E,// 1
-	0x1F,// 2
-	0x20,// 3
-	0x21,// 4
-	0x22,// 5
-	0x23,// 6
-	0x24,// 7
-	0x25,// 8
-	0x26,// 9
-	0x33|SHIFT,// :
-	0x33,      // ;
-	0x36|SHIFT,// <
-	0x2E,      // =
-	0x37|SHIFT,// >
-	0x38|SHIFT,// ?
-	0x1F|SHIFT,// @
-	0x04|SHIFT,// A
-	0x05|SHIFT,// B
-	0x06|SHIFT,// C
-	0x07|SHIFT,// D
-	0x08|SHIFT,// E
-	0x09|SHIFT,// F
-	0x0A|SHIFT,// G
-	0x0B|SHIFT,// H
-	0x0C|SHIFT,// I
-	0x0D|SHIFT,// J
-	0x0E|SHIFT,// K
-	0x0F|SHIFT,// L
-	0x10|SHIFT,// M
-	0x11|SHIFT,// N
-	0x12|SHIFT,// O
-	0x13|SHIFT,// P
-	0x14|SHIFT,// Q
-	0x15|SHIFT,// R
-	0x16|SHIFT,// S
-	0x17|SHIFT,// T
-	0x18|SHIFT,// U
-	0x19|SHIFT,// V
-	0x1A|SHIFT,// W
-	0x1B|SHIFT,// X
-	0x1C|SHIFT,// Y
-	0x1D|SHIFT,// Z
-	0x2F,      // [
-	0x31,      // bslash
-	0x30,      // ]
-	0x23|SHIFT,// ^
-	0x2D|SHIFT,// _
-	0x35,      // `
-	0x04,      // a
-	0x05,      // b
-	0x06,      // c
-	0x07,      // d
-	0x08,      // e
-	0x09,      // f
-	0x0A,      // g
-	0x0B,      // h
-	0x0C,      // i
-	0x0D,      // j
-	0x0E,      // k
-	0x0F,      // l
-	0x10,      // m
-	0x11,      // n
-	0x12,      // o
-	0x13,      // p
-	0x14,      // q
-	0x15,      // r
-	0x16,      // s
-	0x17,      // t
-	0x18,      // u
-	0x19,      // v
-	0x1A,      // w
-	0x1B,      // x
-	0x1C,      // y
-	0x1D,      // z
-	0x2f|SHIFT,//
-	0x31|SHIFT,// |
-	0x30|SHIFT,// }
-	0x35|SHIFT,// ~
-	0	// DEL
+  0x2C,//  ' '
+  0x1E|SHIFT,// !
+  0x34|SHIFT,// "
+  0x20|SHIFT,// #
+  0x21|SHIFT,// $
+  0x22|SHIFT,// %
+  0x24|SHIFT,// &
+  0x34,      // '
+  0x26|SHIFT,// (
+  0x27|SHIFT,// )
+  0x25|SHIFT,// *
+  0x2E|SHIFT,// +
+  0x36,// ,
+  0x2D,// -
+  0x37,// .
+  0x38,// /
+  0x27,// 0
+  0x1E,// 1
+  0x1F,// 2
+  0x20,// 3
+  0x21,// 4
+  0x22,// 5
+  0x23,// 6
+  0x24,// 7
+  0x25,// 8
+  0x26,// 9
+  0x33|SHIFT,// :
+  0x33,      // ;
+  0x36|SHIFT,// <
+  0x2E,      // =
+  0x37|SHIFT,// >
+  0x38|SHIFT,// ?
+  0x1F|SHIFT,// @
+  0x04|SHIFT,// A
+  0x05|SHIFT,// B
+  0x06|SHIFT,// C
+  0x07|SHIFT,// D
+  0x08|SHIFT,// E
+  0x09|SHIFT,// F
+  0x0A|SHIFT,// G
+  0x0B|SHIFT,// H
+  0x0C|SHIFT,// I
+  0x0D|SHIFT,// J
+  0x0E|SHIFT,// K
+  0x0F|SHIFT,// L
+  0x10|SHIFT,// M
+  0x11|SHIFT,// N
+  0x12|SHIFT,// O
+  0x13|SHIFT,// P
+  0x14|SHIFT,// Q
+  0x15|SHIFT,// R
+  0x16|SHIFT,// S
+  0x17|SHIFT,// T
+  0x18|SHIFT,// U
+  0x19|SHIFT,// V
+  0x1A|SHIFT,// W
+  0x1B|SHIFT,// X
+  0x1C|SHIFT,// Y
+  0x1D|SHIFT,// Z
+  0x2F,      // [
+  0x31,      // bslash
+  0x30,      // ]
+  0x23|SHIFT,// ^
+  0x2D|SHIFT,// _
+  0x35,      // `
+  0x04,      // a
+  0x05,      // b
+  0x06,      // c
+  0x07,      // d
+  0x08,      // e
+  0x09,      // f
+  0x0A,      // g
+  0x0B,      // h
+  0x0C,      // i
+  0x0D,      // j
+  0x0E,      // k
+  0x0F,      // l
+  0x10,      // m
+  0x11,      // n
+  0x12,      // o
+  0x13,      // p
+  0x14,      // q
+  0x15,      // r
+  0x16,      // s
+  0x17,      // t
+  0x18,      // u
+  0x19,      // v
+  0x1A,      // w
+  0x1B,      // x
+  0x1C,      // y
+  0x1D,      // z
+  0x2f|SHIFT,//
+  0x31|SHIFT,// |
+  0x30|SHIFT,// }
+  0x35|SHIFT,// ~
+  0  // DEL
 };

 /* usb device class handler */
@@ -301,7 +301,12 @@ static usb_sts_type class_setup_handler(void *udev, usb_setup_type *setup)
        case USB_STD_REQ_SET_INTERFACE:
          pkeyboard->alt_setting = setup->wValue;
          break;
+        case USB_STD_REQ_CLEAR_FEATURE:
+          break;
+        case USB_STD_REQ_SET_FEATURE:
+          break;
        default:
+          usbd_ctrl_unsupport(pudev);
          break;
      }
      break;
--- a/middlewares/usbd_class/keyboard/keyboard_desc.c
+++ b/middlewares/usbd_class/keyboard/keyboard_desc.c
@@ -53,7 +53,10 @@ static usbd_desc_t *get_device_config_string(void);
 static uint16_t usbd_unicode_convert(uint8_t *string, uint8_t *unicode_buf);
 static void usbd_int_to_unicode (uint32_t value , uint8_t *pbuf , uint8_t len);
 static void get_serial_num(void);
-static uint8_t g_usbd_desc_buffer[256];
+#if defined ( __ICCARM__ ) /* iar compiler */
+  #pragma data_alignment=4
+#endif
+ALIGNED_HEAD static uint8_t g_usbd_desc_buffer[256] ALIGNED_TAIL;

 /**
  * @brief  keyboard device descriptor handler structure
--- a/middlewares/usbd_class/mouse/mouse_class.c
+++ b/middlewares/usbd_class/mouse/mouse_class.c
@@ -166,6 +166,10 @@ static usb_sts_type class_setup_handler(void *udev, usb_setup_type *setup)
        case USB_STD_REQ_SET_INTERFACE:
          pmouse->alt_setting = setup->wValue;
          break;
+        case USB_STD_REQ_CLEAR_FEATURE:
+          break;
+        case USB_STD_REQ_SET_FEATURE:
+          break;
        default:
          usbd_ctrl_unsupport(pudev);
          break;
--- a/middlewares/usbd_class/mouse/mouse_desc.c
+++ b/middlewares/usbd_class/mouse/mouse_desc.c
@@ -53,7 +53,10 @@ static usbd_desc_t *get_device_config_string(void);
 static uint16_t usbd_unicode_convert(uint8_t *string, uint8_t *unicode_buf);
 static void usbd_int_to_unicode (uint32_t value , uint8_t *pbuf , uint8_t len);
 static void get_serial_num(void);
-static uint8_t g_usbd_desc_buffer[256];
+#if defined ( __ICCARM__ ) /* iar compiler */
+  #pragma data_alignment=4
+#endif
+ALIGNED_HEAD static uint8_t g_usbd_desc_buffer[256] ALIGNED_TAIL;

 /**
  * @brief  mouse device descriptor handler structure
--- a/middlewares/usbd_class/msc/msc_bot_scsi.c
+++ b/middlewares/usbd_class/msc/msc_bot_scsi.c
@@ -42,11 +42,11 @@
  #pragma data_alignment=4
 #endif
 ALIGNED_HEAD uint8_t page00_inquiry_data[] ALIGNED_TAIL = {
-	0x00,
-	0x00,
-	0x00,
-	0x00,
-	0x00,
+  0x00,
+  0x00,
+  0x00,
+  0x00,
+  0x00,

 };
 #if defined ( __ICCARM__ ) /* iar compiler */
--- a/middlewares/usbd_class/msc/msc_bot_scsi.h
+++ b/middlewares/usbd_class/msc/msc_bot_scsi.h
@@ -197,7 +197,7 @@ typedef struct
  uint32_t blk_nbr[MSC_SUPPORT_MAX_LUN];
  uint32_t blk_size[MSC_SUPPORT_MAX_LUN];

-  uint32_t blk_addr;
+  uint64_t blk_addr;
  uint32_t blk_len;

  uint32_t data_len;
--- a/middlewares/usbd_class/msc/msc_class.c
+++ b/middlewares/usbd_class/msc/msc_class.c
@@ -164,7 +164,10 @@ static usb_sts_type class_setup_handler(void *udev, usb_setup_type *setup)
          }
          bot_scsi_clear_feature(udev, setup->wIndex);
          break;
+        case USB_STD_REQ_SET_FEATURE:
+          break;
        default:
+          usbd_ctrl_unsupport(pudev);
          break;
      }
      break;
--- a/middlewares/usbd_class/msc/msc_desc.c
+++ b/middlewares/usbd_class/msc/msc_desc.c
@@ -54,7 +54,10 @@ static usbd_desc_t *get_device_config_string(void);
 static uint16_t usbd_unicode_convert(uint8_t *string, uint8_t *unicode_buf);
 static void usbd_int_to_unicode (uint32_t value , uint8_t *pbuf , uint8_t len);
 static void get_serial_num(void);
-static uint8_t g_usbd_desc_buffer[256];
+#if defined ( __ICCARM__ ) /* iar compiler */
+  #pragma data_alignment=4
+#endif
+ALIGNED_HEAD static uint8_t g_usbd_desc_buffer[256] ALIGNED_TAIL;

 /**
  * @brief device descriptor handler structure
--- a/middlewares/usbd_class/printer/printer_class.c
+++ b/middlewares/usbd_class/printer/printer_class.c
@@ -163,7 +163,12 @@ static usb_sts_type class_setup_handler(void *udev, usb_setup_type *setup)
        case USB_STD_REQ_SET_INTERFACE:
          pprter->alt_setting = setup->wValue;
          break;
+        case USB_STD_REQ_CLEAR_FEATURE:
+          break;
+        case USB_STD_REQ_SET_FEATURE:
+          break;
        default:
+          usbd_ctrl_unsupport(pudev);
          break;
      }
      break;
--- a/middlewares/usbd_class/printer/printer_desc.c
+++ b/middlewares/usbd_class/printer/printer_desc.c
@@ -54,7 +54,10 @@ static usbd_desc_t *get_device_config_string(void);
 static uint16_t usbd_unicode_convert(uint8_t *string, uint8_t *unicode_buf);
 static void usbd_int_to_unicode (uint32_t value , uint8_t *pbuf , uint8_t len);
 static void get_serial_num(void);
-static uint8_t g_usbd_desc_buffer[256];
+#if defined ( __ICCARM__ ) /* iar compiler */
+  #pragma data_alignment=4
+#endif
+ALIGNED_HEAD static uint8_t g_usbd_desc_buffer[256] ALIGNED_TAIL;

 /**
  * @brief device descriptor handler structure
--- a/middlewares/usbd_drivers/inc/usb_std.h
+++ b/middlewares/usbd_drivers/inc/usb_std.h
@@ -248,8 +248,13 @@ typedef struct
 /**
  * @brief min and max define
  */
+#ifndef MIN
 #define MIN(a, b)  (uint16_t)(((a) < (b)) ? (a) : (b)) /*!< min define*/
+#endif
+
+#ifndef MAX
 #define MAX(a, b)  (uint16_t)(((a) > (b)) ? (a) : (b)) /*!< max define*/
+#endif

 /**
  * @brief low byte and high byte define
--- a/middlewares/usbd_drivers/src/usbd_sdr.c
+++ b/middlewares/usbd_drivers/src/usbd_sdr.c
@@ -395,9 +395,11 @@ usb_sts_type usbd_interface_request(usbd_core_type *udev)
  usb_setup_type *setup = &udev->setup;
  switch(udev->conn_state)
  {
+    case USB_CONN_STATE_DEFAULT:
+    case USB_CONN_STATE_ADDRESSED:
    case USB_CONN_STATE_CONFIGURED:
-      udev->class_handler->setup_handler(udev, &udev->setup);
-      if(setup->wLength == 0)
+      ret = udev->class_handler->setup_handler(udev, &udev->setup);
+      if(setup->wLength == 0 && ret == USB_OK)
      {
        usbd_ctrl_send_status(udev);
      }
@@ -421,9 +423,10 @@ usb_sts_type usbd_endpoint_request(usbd_core_type *udev)
  uint8_t ept_addr = LBYTE(setup->wIndex);
  usb_ept_info *ept_info;

-  if((setup->bmRequestType & USB_REQ_TYPE_RESERVED) == USB_REQ_TYPE_CLASS)
+  if((setup->bmRequestType & USB_REQ_TYPE_RESERVED) != USB_REQ_TYPE_STANDARD)
  {
    udev->class_handler->setup_handler(udev, &udev->setup);
+    return ret;
  }
  switch(setup->bRequest)
  {
@@ -435,6 +438,17 @@ usb_sts_type usbd_endpoint_request(usbd_core_type *udev)
          {
            usbd_set_stall(udev, ept_addr);
          }
+          if((ept_addr & 0x80) != 0)
+          {
+           ept_info = &udev->ept_in[ept_addr & 0x7F];
+          }
+          else
+          {
+            ept_info = &udev->ept_out[ept_addr & 0x7F];
+          }
+          ept_info->status = 0x0000;
+          usbd_ctrl_send(udev, (uint8_t *)(&ept_info->status), 2);
+          
          break;
        case USB_CONN_STATE_CONFIGURED:
        {