Fixed some MISRA violations in new HAL code.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@8077 35acf78f-673a-0410-8e92-d51de3d6d3f4

3 files changed, 10 insertions, 6 deletions

diff --git a/os/hal/include/sdc.h b/os/hal/include/sdc.h
index 94b6841d6..0f070e322 100644
--- a/os/hal/include/sdc.h
+++ b/os/hal/include/sdc.h
@@ -182,7 +182,7 @@ extern "C" {
   sdcflags_t sdcGetAndClearErrors(SDCDriver *sdcp);

   bool sdcSync(SDCDriver *sdcp);

   bool sdcGetInfo(SDCDriver *sdcp, BlockDeviceInfo *bdip);

-  bool sdcErase(SDCDriver *mmcp, uint32_t startblk, uint32_t endblk);

+  bool sdcErase(SDCDriver *sdcp, uint32_t startblk, uint32_t endblk);

   bool _sdc_wait_for_transfer_state(SDCDriver *sdcp);

 #ifdef __cplusplus

 }

diff --git a/os/hal/src/rtc.c b/os/hal/src/rtc.c
index 5459b3b85..41015ad8b 100644
--- a/os/hal/src/rtc.c
+++ b/os/hal/src/rtc.c
@@ -235,7 +235,7 @@ void rtcConvertDateTimeToStructTm(const RTCDateTime *timespec,
   timp->tm_hour = tmp / 3600;

 

   if (NULL != tv_msec) {

-    *tv_msec = (uint32_t)timespec->millisecond % 1000;

+    *tv_msec = (uint32_t)timespec->millisecond % 1000U;

   }

 }

 

diff --git a/os/hal/src/sdc.c b/os/hal/src/sdc.c
index 40006a6c1..a9dbb1534 100644
--- a/os/hal/src/sdc.c
+++ b/os/hal/src/sdc.c
@@ -325,7 +325,7 @@ static bool sdc_detect_bus_clk(SDCDriver *sdcp, sdcbusclk_t *clk) {
 

   /* Looks like only "high capacity" cards produce meaningful results during

      this clock detection procedure.*/

-  if (0 == _mmcsd_get_slice(sdcp->csd, MMCSD_CSD_10_CSD_STRUCTURE_SLICE)) {

+  if (0U == _mmcsd_get_slice(sdcp->csd, MMCSD_CSD_10_CSD_STRUCTURE_SLICE)) {

     *clk = SDC_CLK_25MHz;

     return HAL_SUCCESS;

   }

@@ -956,12 +956,14 @@ bool sdcErase(SDCDriver *sdcp, uint32_t startblk, uint32_t endblk) {
   sdcp->state = BLK_WRITING;

 

   /* Handling command differences between HC and normal cards.*/

-  if (!(sdcp->cardmode & SDC_MODE_HIGH_CAPACITY)) {

+  if ((sdcp->cardmode & SDC_MODE_HIGH_CAPACITY) != 0U) {

     startblk *= MMCSD_BLOCK_SIZE;

     endblk *= MMCSD_BLOCK_SIZE;

   }

 

-  _sdc_wait_for_transfer_state(sdcp);

+  if (_sdc_wait_for_transfer_state(sdcp)) {

+    goto failed;

+  }

 

   if ((sdc_lld_send_cmd_short_crc(sdcp, MMCSD_CMD_ERASE_RW_BLK_START,

                                   startblk, resp) != HAL_SUCCESS) ||

@@ -985,7 +987,9 @@ bool sdcErase(SDCDriver *sdcp, uint32_t startblk, uint32_t endblk) {
   /* TODO: ??????????????????????????? */

 

   /* Wait for it to return to transfer state to indicate it has finished erasing */

-  _sdc_wait_for_transfer_state(sdcp);

+  if (_sdc_wait_for_transfer_state(sdcp)) {

+    goto failed;

+  }

 

   sdcp->state = BLK_READY;

   return HAL_SUCCESS;