From 463b1c029477e6c5eacae2cebcdcb8ba534ef9bb Mon Sep 17 00:00:00 2001 From: hathach Date: Sun, 13 Jan 2013 19:27:17 +0700 Subject: rename ASSERT_ERROR to ASSERT_STATUS add binary const support @ common/binary.h enhance assert support @ common/assertion.h add test code for assertion.h --- tinyusb/device/dcd.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tinyusb/device') diff --git a/tinyusb/device/dcd.c b/tinyusb/device/dcd.c index ea4de2561..8df95e131 100644 --- a/tinyusb/device/dcd.c +++ b/tinyusb/device/dcd.c @@ -119,18 +119,18 @@ TUSB_Error_t dcd_init(uint8_t coreid) /* Initialise the class driver(s) */ #ifdef TUSB_CFG_DEVICE_CDC - ASSERT_ERROR( tusb_cdc_init(g_hUsb, &USB_FsConfigDescriptor.CDC_CCI_Interface, + ASSERT_STATUS( tusb_cdc_init(g_hUsb, &USB_FsConfigDescriptor.CDC_CCI_Interface, &USB_FsConfigDescriptor.CDC_DCI_Interface, &membase, &memsize) ); #endif #ifdef TUSB_CFG_DEVICE_HID_KEYBOARD - ASSERT_ERROR( tusb_hid_init(g_hUsb , &USB_FsConfigDescriptor.HID_KeyboardInterface , + ASSERT_STATUS( tusb_hid_init(g_hUsb , &USB_FsConfigDescriptor.HID_KeyboardInterface , HID_KeyboardReportDescriptor, USB_FsConfigDescriptor.HID_KeyboardHID.DescriptorList[0].wDescriptorLength, &membase , &memsize) ); #endif #ifdef TUSB_CFG_DEVICE_HID_MOUSE - ASSERT_ERROR( tusb_hid_init(g_hUsb , &USB_FsConfigDescriptor.HID_MouseInterface , + ASSERT_STATUS( tusb_hid_init(g_hUsb , &USB_FsConfigDescriptor.HID_MouseInterface , HID_MouseReportDescriptor, USB_FsConfigDescriptor.HID_MouseHID.DescriptorList[0].wDescriptorLength, &membase , &memsize) ); #endif -- cgit v1.3.1