From 7c5b3861303e3cf0210a40bf8a0a511583700fd0 Mon Sep 17 00:00:00 2001 From: hathach Date: Fri, 21 Mar 2014 19:23:19 +0700 Subject: clean ATTR_USB_MIN_ALIGNMENT on application and most of device except the msc_device.c --- tinyusb/class/cdc_device.c | 2 +- tinyusb/class/hid_device.c | 4 +--- tinyusb/class/msc_device.c | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) (limited to 'tinyusb/class') diff --git a/tinyusb/class/cdc_device.c b/tinyusb/class/cdc_device.c index 332e33ea8..405095402 100644 --- a/tinyusb/class/cdc_device.c +++ b/tinyusb/class/cdc_device.c @@ -50,7 +50,7 @@ //--------------------------------------------------------------------+ // MACRO CONSTANT TYPEDEF //--------------------------------------------------------------------+ -TUSB_CFG_ATTR_USBRAM ATTR_USB_MIN_ALIGNMENT +TUSB_CFG_ATTR_USBRAM static cdc_line_coding_t cdcd_line_coding[CONTROLLER_DEVICE_NUMBER]; typedef struct { diff --git a/tinyusb/class/hid_device.c b/tinyusb/class/hid_device.c index 1adf035b6..1f266da21 100644 --- a/tinyusb/class/hid_device.c +++ b/tinyusb/class/hid_device.c @@ -101,10 +101,8 @@ static hidd_class_driver_t const hidd_class_driver[HIDD_NUMBER_OF_SUBCLASS] = #endif }; - // TODO [HID] generic -TUSB_CFG_ATTR_USBRAM ATTR_USB_MIN_ALIGNMENT -uint8_t m_control_data[ MAX_OF(sizeof(hid_keyboard_report_t), sizeof(hid_mouse_report_t)) ]; +TUSB_CFG_ATTR_USBRAM uint8_t m_control_data[ MAX_OF(sizeof(hid_keyboard_report_t), sizeof(hid_mouse_report_t)) ]; //--------------------------------------------------------------------+ // KEYBOARD APPLICATION API diff --git a/tinyusb/class/msc_device.c b/tinyusb/class/msc_device.c index d8f64f163..5f66e64b2 100644 --- a/tinyusb/class/msc_device.c +++ b/tinyusb/class/msc_device.c @@ -69,7 +69,7 @@ typedef struct { endpoint_handle_t edpt_in, edpt_out; }mscd_interface_t; -ATTR_USB_MIN_ALIGNMENT TUSB_CFG_ATTR_USBRAM STATIC_VAR mscd_interface_t mscd_data; +TUSB_CFG_ATTR_USBRAM STATIC_VAR mscd_interface_t mscd_data; //--------------------------------------------------------------------+ // INTERNAL OBJECT & FUNCTION DECLARATION //--------------------------------------------------------------------+ -- cgit v1.3.1