summaryrefslogtreecommitdiff
path: root/demos/host/src
diff options
context:
space:
mode:
authorhathach <[email protected]>2013-09-19 16:11:11 +0700
committerhathach <[email protected]>2013-09-19 16:11:11 +0700
commit86681fe44226c636e62320f3cedcaddcd53259e9 (patch)
treecd650952db469968d96bef1f4ea18207d3095b8c /demos/host/src
parent61c591b9ac49022fd287827951cd1f34d4fdbb1a (diff)
starting to add support for IAR workbench
Diffstat (limited to 'demos/host/src')
-rw-r--r--demos/host/src/cdc_serial_app.c6
-rw-r--r--demos/host/src/keyboard_app.c4
-rw-r--r--demos/host/src/mouse_app.c4
-rw-r--r--demos/host/src/tusb_config.h2
4 files changed, 9 insertions, 7 deletions
diff --git a/demos/host/src/cdc_serial_app.c b/demos/host/src/cdc_serial_app.c
index 197d60a84..e44cfd924 100644
--- a/demos/host/src/cdc_serial_app.c
+++ b/demos/host/src/cdc_serial_app.c
@@ -93,7 +93,7 @@ void tusbh_cdc_xfer_isr(uint8_t dev_addr, tusb_event_t event, cdc_pipeid_t pipe_
case TUSB_EVENT_XFER_STALLED:
default :
- ASSERT(false, (void) 0); // error
+ ASSERT(false, VOID_RETURN); // error
break;
}
}else if (pipe_id == CDC_PIPE_DATA_OUT)
@@ -113,9 +113,9 @@ void cdc_serial_app_init(void)
memclr_(buffer_in, sizeof(buffer_in));
queue_hdl = osal_queue_create( OSAL_QUEUE_REF(queue_def) );
- ASSERT_PTR( queue_hdl, (void) 0 );
+ ASSERT_PTR( queue_hdl, VOID_RETURN);
- ASSERT( TUSB_ERROR_NONE == osal_task_create(OSAL_TASK_REF(cdc_serial_app_task)), (void) 0 );
+ ASSERT( TUSB_ERROR_NONE == osal_task_create(OSAL_TASK_REF(cdc_serial_app_task)), VOID_RETURN);
}
//------------- main task -------------//
diff --git a/demos/host/src/keyboard_app.c b/demos/host/src/keyboard_app.c
index 27d5c0cfe..404a27c41 100644
--- a/demos/host/src/keyboard_app.c
+++ b/demos/host/src/keyboard_app.c
@@ -108,10 +108,10 @@ void keyboard_app_init(void)
memclr_(&usb_keyboard_report, sizeof(tusb_keyboard_report_t));
queue_kbd_hdl = osal_queue_create( OSAL_QUEUE_REF(queue_kbd_def) );
- ASSERT_PTR( queue_kbd_hdl, (void) 0 );
+ ASSERT_PTR( queue_kbd_hdl, VOID_RETURN );
ASSERT( TUSB_ERROR_NONE == osal_task_create( OSAL_TASK_REF(keyboard_app_task) ) ,
- (void) 0 );
+ VOID_RETURN);
}
//------------- main task -------------//
diff --git a/demos/host/src/mouse_app.c b/demos/host/src/mouse_app.c
index 666aa02f5..3469fc4ab 100644
--- a/demos/host/src/mouse_app.c
+++ b/demos/host/src/mouse_app.c
@@ -110,10 +110,10 @@ void mouse_app_init(void)
memclr_(&usb_mouse_report, sizeof(tusb_mouse_report_t));
queue_mouse_hdl = osal_queue_create( OSAL_QUEUE_REF(queue_mouse_def) );
- ASSERT_PTR( queue_mouse_hdl, (void) 0 );
+ ASSERT_PTR( queue_mouse_hdl, VOID_RETURN);
ASSERT( TUSB_ERROR_NONE == osal_task_create( OSAL_TASK_REF(mouse_app_task) ),
- (void) 0 );
+ VOID_RETURN );
}
//------------- main task -------------//
diff --git a/demos/host/src/tusb_config.h b/demos/host/src/tusb_config.h
index 8596660de..b44c2ee73 100644
--- a/demos/host/src/tusb_config.h
+++ b/demos/host/src/tusb_config.h
@@ -113,6 +113,8 @@
#define TUSB_CFG_ATTR_USBRAM __attribute__ ((section(TUSB_RAM_SECTION)))
#elif defined __CC_ARM // Compiled with Keil armcc
#define TUSB_CFG_ATTR_USBRAM
+#elif __ICCARM__ // compiled with IAR
+ #define TUSB_CFG_ATTR_USBRAM
#else
#error compiler not specified
#endif