diff options
| author | Damien George <damien.p.george@gmail.com> | 2014-03-22 12:46:23 +0000 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2014-03-22 12:46:23 +0000 |
| commit | a6787edcea4ff1aa6113eff85c3b866ae0c6cb8c (patch) | |
| tree | 763bb0d6ef3a4642aa585564d9d85e09bf9a4cb2 /stmhal/usbdev/class | |
| parent | c2a4cb4f04c82d7e283fd7af9609230ae46eb5a2 (diff) | |
stmhal: Tidy up USB device configuration. Make it use less RAM.
Diffstat (limited to 'stmhal/usbdev/class')
| -rw-r--r-- | stmhal/usbdev/class/cdc_msc/inc/usbd_cdc_msc.h | 10 | ||||
| -rw-r--r-- | stmhal/usbdev/class/cdc_msc/src/usbd_cdc_msc.c | 14 |
2 files changed, 7 insertions, 17 deletions
diff --git a/stmhal/usbdev/class/cdc_msc/inc/usbd_cdc_msc.h b/stmhal/usbdev/class/cdc_msc/inc/usbd_cdc_msc.h index 6b738adde..5299f31e9 100644 --- a/stmhal/usbdev/class/cdc_msc/inc/usbd_cdc_msc.h +++ b/stmhal/usbdev/class/cdc_msc/inc/usbd_cdc_msc.h @@ -5,11 +5,9 @@ #include "usbd_msc_scsi.h" #include "usbd_ioreq.h" -// CDC endpoint parameters -#define CDC_DATA_FS_MAX_PACKET_SIZE 64 // Endpoint IN & OUT Packet size -#define CDC_CMD_PACKET_SIZE 8 // Control Endpoint Packet size -#define CDC_DATA_FS_IN_PACKET_SIZE CDC_DATA_FS_MAX_PACKET_SIZE -#define CDC_DATA_FS_OUT_PACKET_SIZE CDC_DATA_FS_MAX_PACKET_SIZE +// CDC and MSC packet sizes +#define CDC_DATA_FS_MAX_PACKET_SIZE (64) // endpoint IN & OUT packet size +#define MSC_MEDIA_PACKET (2048) // was 8192; how low can it go whilst still working? #if 0 // CDC @@ -34,7 +32,7 @@ #define MSC_IFACE_NUM (0) #define MSC_IN_EP (0x81) #define MSC_OUT_EP (0x01) -#elif 0 +#elif 1 // CDC + MSC #define USB_CDC_MSC_CONFIG_DESC_SIZ (98) #define NUM_INTERFACES (3) diff --git a/stmhal/usbdev/class/cdc_msc/src/usbd_cdc_msc.c b/stmhal/usbdev/class/cdc_msc/src/usbd_cdc_msc.c index 8ebf33a10..df080ee4f 100644 --- a/stmhal/usbdev/class/cdc_msc/src/usbd_cdc_msc.c +++ b/stmhal/usbdev/class/cdc_msc/src/usbd_cdc_msc.c @@ -3,17 +3,9 @@ #define USB_DESC_TYPE_ASSOCIATION (0x0b) -/* currently unused -#define CDC_SEND_ENCAPSULATED_COMMAND 0x00 -#define CDC_GET_ENCAPSULATED_RESPONSE 0x01 -#define CDC_SET_COMM_FEATURE 0x02 -#define CDC_GET_COMM_FEATURE 0x03 -#define CDC_CLEAR_COMM_FEATURE 0x04 -#define CDC_SET_LINE_CODING 0x20 -#define CDC_GET_LINE_CODING 0x21 -#define CDC_SET_CONTROL_LINE_STATE 0x22 -#define CDC_SEND_BREAK 0x23 -*/ +#define CDC_CMD_PACKET_SIZE 8 // Control Endpoint Packet size +#define CDC_DATA_FS_IN_PACKET_SIZE CDC_DATA_FS_MAX_PACKET_SIZE +#define CDC_DATA_FS_OUT_PACKET_SIZE CDC_DATA_FS_MAX_PACKET_SIZE #define BOT_GET_MAX_LUN 0xFE #define BOT_RESET 0xFF |