From 38ac197ecd9ac41cf77f239b39d36f4c56cf8bb8 Mon Sep 17 00:00:00 2001 From: gdisirio Date: Wed, 27 Jun 2012 18:03:31 +0000 Subject: git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@4350 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- os/hal/include/io_block.h | 2 +- os/hal/include/usb.h | 15 ++++++++++++--- os/hal/platforms/STM32/OTGv1/usb_lld.h | 9 --------- os/ports/GCC/ARMCMx/chcore_v6m.c | 4 ++-- os/ports/GCC/ARMCMx/chcore_v6m.h | 6 +++--- os/ports/GCC/ARMCMx/chcore_v7m.c | 4 ++-- os/ports/GCC/ARMCMx/chcore_v7m.h | 6 +++--- 7 files changed, 23 insertions(+), 23 deletions(-) diff --git a/os/hal/include/io_block.h b/os/hal/include/io_block.h index acd20ebca..90b17be13 100644 --- a/os/hal/include/io_block.h +++ b/os/hal/include/io_block.h @@ -49,7 +49,7 @@ typedef enum { BLK_DISCONNECTING = 4, /**< Disconnection in progress. */ BLK_READY = 5, /**< Device ready. */ BLK_READING = 6, /**< Read operation in progress. */ - BLK_WRITING = 7, /**< Write operation in progress. */ + BLK_WRITING = 7 /**< Write operation in progress. */ } blkstate_t; /** diff --git a/os/hal/include/usb.h b/os/hal/include/usb.h index a0a7298e0..9cb933b2d 100644 --- a/os/hal/include/usb.h +++ b/os/hal/include/usb.h @@ -215,7 +215,7 @@ typedef enum { USB_STOP = 1, /**< Stopped. */ USB_READY = 2, /**< Ready, after bus reset. */ USB_SELECTED = 3, /**< Address assigned. */ - USB_ACTIVE = 4, /**< Active, configuration selected.*/ + USB_ACTIVE = 4 /**< Active, configuration selected.*/ } usbstate_t; /** @@ -248,7 +248,7 @@ typedef enum { USB_EVENT_CONFIGURED = 2, /**< Configuration selected. */ USB_EVENT_SUSPEND = 3, /**< Entering suspend mode. */ USB_EVENT_WAKEUP = 4, /**< Leaving suspend mode. */ - USB_EVENT_STALLED = 5, /**< Endpoint 0 error, stalled. */ + USB_EVENT_STALLED = 5 /**< Endpoint 0 error, stalled. */ } usbevent_t; /** @@ -322,7 +322,7 @@ typedef const USBDescriptor * (*usbgetdescriptor_t)(USBDriver *usbp, * @{ */ /** - * @brief Returns the sriver state. + * @brief Returns the driver state. * * @param[in] usbp pointer to the @p USBDriver object * @return The driver state. @@ -331,6 +331,15 @@ typedef const USBDescriptor * (*usbgetdescriptor_t)(USBDriver *usbp, */ #define usbGetDriverStateI(usbp) ((usbp)->state) +/** + * @brief Fetches a 16 bits word value from an USB message. + * + * @param[in] p pointer to the 16 bits word + * + * @notapi + */ +#define usbFetchWord(p) ((uint16_t)*(p) | ((uint16_t)*((p) + 1) << 8)) + /** * @brief Connects the USB device. * diff --git a/os/hal/platforms/STM32/OTGv1/usb_lld.h b/os/hal/platforms/STM32/OTGv1/usb_lld.h index f44f1591e..8b2903982 100644 --- a/os/hal/platforms/STM32/OTGv1/usb_lld.h +++ b/os/hal/platforms/STM32/OTGv1/usb_lld.h @@ -341,15 +341,6 @@ struct USBDriver { /* Driver macros. */ /*===========================================================================*/ -/** - * @brief Fetches a 16 bits word value from an USB message. - * - * @param[in] p pointer to the 16 bits word - * - * @notapi - */ -#define usb_lld_fetch_word(p) (*(uint16_t *)(p)) - /** * @brief Returns the exact size of a receive transaction. * @details The received size can be different from the size specified in diff --git a/os/ports/GCC/ARMCMx/chcore_v6m.c b/os/ports/GCC/ARMCMx/chcore_v6m.c index 98b834745..63576cb3d 100644 --- a/os/ports/GCC/ARMCMx/chcore_v6m.c +++ b/os/ports/GCC/ARMCMx/chcore_v6m.c @@ -109,12 +109,12 @@ void _port_irq_epilogue(regarm_t lr) { required or not.*/ if (chSchIsPreemptionRequired()) { /* Preemption is required we need to enforce a context switch.*/ - ctxp->pc = _port_switch_from_isr; + ctxp->pc = (void *)_port_switch_from_isr; } else { /* Preemption not required, we just need to exit the exception atomically.*/ - ctxp->pc = _port_exit_from_isr; + ctxp->pc = (void *)_port_exit_from_isr; } /* Note, returning without unlocking is intentional, this is done in diff --git a/os/ports/GCC/ARMCMx/chcore_v6m.h b/os/ports/GCC/ARMCMx/chcore_v6m.h index 76bfbf184..c60ac661e 100644 --- a/os/ports/GCC/ARMCMx/chcore_v6m.h +++ b/os/ports/GCC/ARMCMx/chcore_v6m.h @@ -208,9 +208,9 @@ struct context { tp->p_ctx.r13 = (struct intctx *)((uint8_t *)workspace + \ wsize - \ sizeof(struct intctx)); \ - tp->p_ctx.r13->r4 = pf; \ - tp->p_ctx.r13->r5 = arg; \ - tp->p_ctx.r13->lr = _port_thread_start; \ + tp->p_ctx.r13->r4 = (void *)(pf); \ + tp->p_ctx.r13->r5 = (void *)(arg); \ + tp->p_ctx.r13->lr = (void *)(_port_thread_start); \ } /** diff --git a/os/ports/GCC/ARMCMx/chcore_v7m.c b/os/ports/GCC/ARMCMx/chcore_v7m.c index a661bb60a..d621074f1 100644 --- a/os/ports/GCC/ARMCMx/chcore_v7m.c +++ b/os/ports/GCC/ARMCMx/chcore_v7m.c @@ -157,7 +157,7 @@ void _port_irq_epilogue(void) { required or not.*/ if (chSchIsPreemptionRequired()) { /* Preemption is required we need to enforce a context switch.*/ - ctxp->pc = _port_switch_from_isr; + ctxp->pc = (void *)_port_switch_from_isr; #if CORTEX_USE_FPU /* Triggering a lazy FPU state save.*/ asm volatile ("vmrs APSR_nzcv, FPSCR" : : : "memory"); @@ -166,7 +166,7 @@ void _port_irq_epilogue(void) { else { /* Preemption not required, we just need to exit the exception atomically.*/ - ctxp->pc = _port_exit_from_isr; + ctxp->pc = (void *)_port_exit_from_isr; } #if CORTEX_USE_FPU diff --git a/os/ports/GCC/ARMCMx/chcore_v7m.h b/os/ports/GCC/ARMCMx/chcore_v7m.h index ea9b8dab5..6a9aa536f 100644 --- a/os/ports/GCC/ARMCMx/chcore_v7m.h +++ b/os/ports/GCC/ARMCMx/chcore_v7m.h @@ -308,9 +308,9 @@ struct context { tp->p_ctx.r13 = (struct intctx *)((uint8_t *)workspace + \ wsize - \ sizeof(struct intctx)); \ - tp->p_ctx.r13->r4 = pf; \ - tp->p_ctx.r13->r5 = arg; \ - tp->p_ctx.r13->lr = _port_thread_start; \ + tp->p_ctx.r13->r4 = (void *)(pf); \ + tp->p_ctx.r13->r5 = (void *)(arg); \ + tp->p_ctx.r13->lr = (void *)(_port_thread_start); \ } /** -- cgit v1.2.3