kingkevin
/
passkey_fw
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clean up

This commit is contained in:
hathach 2019-05-01 20:41:26 +07:00
parent c006f3dbce
commit 2050778763
3 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/class/cdc/cdc_device.c
View File

@ -71,7 +71,7 @@ typedef struct
//--------------------------------------------------------------------+ //--------------------------------------------------------------------+
// INTERNAL OBJECT & FUNCTION DECLARATION // INTERNAL OBJECT & FUNCTION DECLARATION
//--------------------------------------------------------------------+ //--------------------------------------------------------------------+
CFG_TUSB_MEM_SECTION static cdcd_interface_t _cdcd_itf[CFG_TUD_CDC] = { { 0 } }; CFG_TUSB_MEM_SECTION static cdcd_interface_t _cdcd_itf[CFG_TUD_CDC];
// TODO will be replaced by dcd_edpt_busy() // TODO will be replaced by dcd_edpt_busy()
bool pending_read_from_host; bool pending_read_from_host;

12
src/class/msc/msc_device.c
View File

@ -42,13 +42,9 @@ enum
MSC_STAGE_STATUS MSC_STAGE_STATUS
}; };
typedef struct { typedef struct
CFG_TUSB_MEM_ALIGN msc_cbw_t cbw; {
CFG_TUSB_MEM_ALIGN msc_cbw_t cbw;
//#if defined (__ICCARM__) && (CFG_TUSB_MCU == OPT_MCU_LPC11UXX || CFG_TUSB_MCU == OPT_MCU_LPC13XX)
// uint8_t padding1[64-sizeof(msc_cbw_t)]; // IAR cannot align struct's member
//#endif
CFG_TUSB_MEM_ALIGN msc_csw_t csw; CFG_TUSB_MEM_ALIGN msc_csw_t csw;
uint8_t itf_num; uint8_t itf_num;
@ -66,7 +62,7 @@ typedef struct {
uint8_t add_sense_qualifier; uint8_t add_sense_qualifier;
}mscd_interface_t; }mscd_interface_t;
CFG_TUSB_MEM_SECTION CFG_TUSB_MEM_ALIGN static mscd_interface_t _mscd_itf = { 0 }; CFG_TUSB_MEM_SECTION CFG_TUSB_MEM_ALIGN static mscd_interface_t _mscd_itf;
CFG_TUSB_MEM_SECTION CFG_TUSB_MEM_ALIGN static uint8_t _mscd_buf[CFG_TUD_MSC_BUFSIZE]; CFG_TUSB_MEM_SECTION CFG_TUSB_MEM_ALIGN static uint8_t _mscd_buf[CFG_TUD_MSC_BUFSIZE];
//--------------------------------------------------------------------+ //--------------------------------------------------------------------+

4
src/portable/nordic/nrf5x/dcd_nrf5x.c
View File

@ -489,7 +489,7 @@ void USBD_IRQHandler(void)
{ {
xfer->total_len = xfer->actual_len; xfer->total_len = xfer->actual_len;
// BULK/INT OUT complete // CBI OUT complete
dcd_event_xfer_complete(0, epnum, xfer->actual_len, XFER_RESULT_SUCCESS, true); dcd_event_xfer_complete(0, epnum, xfer->actual_len, XFER_RESULT_SUCCESS, true);
} }
} }
@ -524,7 +524,7 @@ void USBD_IRQHandler(void)
xact_in_prepare(epnum); xact_in_prepare(epnum);
} else } else
{ {
// Bulk/Int IN complete // CBI IN complete
dcd_event_xfer_complete(0, epnum | TUSB_DIR_IN_MASK, xfer->actual_len, XFER_RESULT_SUCCESS, true); dcd_event_xfer_complete(0, epnum | TUSB_DIR_IN_MASK, xfer->actual_len, XFER_RESULT_SUCCESS, true);
} }
} }