Merge branch 'master' of https://github.com/ChibiOS/ChibiOS-Contrib

5 files changed, 35 insertions, 37 deletions

diff --git a/os/hal/src/hal_ee24xx.c b/os/hal/src/hal_ee24xx.c
index 632ffbb..725258c 100644
--- a/os/hal/src/hal_ee24xx.c
+++ b/os/hal/src/hal_ee24xx.c
@@ -105,7 +105,7 @@ static systime_t calc_timeout(I2CDriver *i2cp, size_t txbytes, size_t rxbytes) {
   tmo = ((txbytes + rxbytes + 1) * bitsinbyte * 1000);
   tmo /= EEPROM_I2C_CLOCK;
   tmo += 10; /* some additional milliseconds to be safer */
-  return MS2ST(tmo);
+  return TIME_MS2I(tmo);
 }
 
 /**
@@ -202,7 +202,7 @@ static void __fitted_write(void *ip, const uint8_t *data, size_t len, uint32_t *
 
   msg_t status = MSG_RESET;
 
-  osalDbgAssert(len != 0, "something broken in hi level part");
+  osalDbgAssert(len > 0, "len must be greater than 0");
 
   status = eeprom_write(((I2CEepromFileStream *)ip)->cfg,
                         eepfs_getposition(ip), data, len);
@@ -214,15 +214,15 @@ static void __fitted_write(void *ip, const uint8_t *data, size_t len, uint32_t *
 
 /**
  * @brief     Write data to EEPROM.
- * @details   Only one EEPROM page can be written at once. So fucntion
+ * @details   Only one EEPROM page can be written at once. So function
  *            splits large data chunks in small EEPROM transactions if needed.
- * @note      To achieve the maximum effectivity use write operations
+ * @note      To achieve the maximum efficiency use write operations
  *            aligned to EEPROM page boundaries.
  */
 static size_t write(void *ip, const uint8_t *bp, size_t n) {
 
-  size_t   len = 0;     /* bytes to be written at one trasaction */
-  uint32_t written; /* total bytes successfully written */
+  size_t   len = 0;      /* bytes to be written per transaction */
+  uint32_t written = 0;  /* total bytes successfully written */
   uint16_t pagesize;
   uint32_t firstpage;
   uint32_t lastpage;
@@ -242,12 +242,10 @@ static size_t write(void *ip, const uint8_t *bp, size_t n) {
   lastpage  = (((EepromFileStream *)ip)->cfg->barrier_low +
                eepfs_getposition(ip) + n - 1) / pagesize;
 
-  written = 0;
-  /* data fitted in single page */
+  /* data fits in single page */
   if (firstpage == lastpage) {
     len = n;
     __fitted_write(ip, bp, len, &written);
-    bp += len;
     return written;
   }
 
@@ -255,17 +253,19 @@ static size_t write(void *ip, const uint8_t *bp, size_t n) {
     /* write first piece of data to first page boundary */
     len =  ((firstpage + 1) * pagesize) - eepfs_getposition(ip);
     len -= ((EepromFileStream *)ip)->cfg->barrier_low;
-    __fitted_write(ip, bp, len, &written);
+    if (__fitted_write(ip, bp, len, &written) != MSG_OK)
+      return written;
     bp += len;
 
-    /* now writes blocks at a size of pages (may be no one) */
+    /* now write page sized blocks (zero or more) */
     while ((n - written) > pagesize) {
       len = pagesize;
-      __fitted_write(ip, bp, len, &written);
+      if (__fitted_write(ip, bp, len, &written) != MSG_OK)
+        return written;
       bp += len;
     }
 
-    /* wrtie tail */
+    /* write tail */
     len = n - written;
     if (len == 0)
       return written;
diff --git a/os/hal/src/hal_ee25xx.c b/os/hal/src/hal_ee25xx.c
index 102aef8..8c35976 100644
--- a/os/hal/src/hal_ee25xx.c
+++ b/os/hal/src/hal_ee25xx.c
@@ -277,7 +277,7 @@ static msg_t __fitted_write(void *ip, const uint8_t *data, size_t len, uint32_t
 
   msg_t status = MSG_RESET;
 
-  osalDbgAssert(len != 0, "something broken in hi level part");
+  osalDbgAssert(len > 0, "len must be greater than 0");
 
   status = ll_eeprom_write(((SPIEepromFileStream *)ip)->cfg,
                            eepfs_getposition(ip), data, len);
@@ -290,15 +290,15 @@ static msg_t __fitted_write(void *ip, const uint8_t *data, size_t len, uint32_t
 
 /**
  * @brief     Write data to EEPROM.
- * @details   Only one EEPROM page can be written at once. So fucntion
+ * @details   Only one EEPROM page can be written at once. So function
  *            splits large data chunks in small EEPROM transactions if needed.
- * @note      To achieve the maximum effectivity use write operations
+ * @note      To achieve the maximum efficiency use write operations
  *            aligned to EEPROM page boundaries.
  */
 static size_t write(void *ip, const uint8_t *bp, size_t n) {
 
-  size_t   len = 0;     /* bytes to be written at one trasaction */
-  uint32_t written; /* total bytes successfully written */
+  size_t   len = 0;      /* bytes to be written per transaction */
+  uint32_t written = 0;  /* total bytes successfully written */
   uint16_t pagesize;
   uint32_t firstpage;
   uint32_t lastpage;
@@ -318,32 +318,30 @@ static size_t write(void *ip, const uint8_t *bp, size_t n) {
   firstpage = (cfg->barrier_low + eepfs_getposition(ip)) / pagesize;
   lastpage  = ((cfg->barrier_low + eepfs_getposition(ip) + n) - 1) / pagesize;
 
-  written = 0;
-  /* data fitted in single page */
+  /* data fits in single page */
   if (firstpage == lastpage) {
     len = n;
     __fitted_write(ip, bp, len, &written);
-    bp += len;
     return written;
   }
+  
   else {
     /* write first piece of data to first page boundary */
     len =  ((firstpage + 1) * pagesize) - eepfs_getposition(ip);
     len -= cfg->barrier_low;
-    __fitted_write(ip, bp, len, &written);
+    if (__fitted_write(ip, bp, len, &written) != MSG_OK)
+      return written;
     bp += len;
 
-    /* now writes blocks at a size of pages (may be no one) */
+    /* now write page sized blocks (zero or more) */
     while ((n - written) > pagesize) {
       len = pagesize;
-      if (__fitted_write(ip, bp, len, &written) != MSG_OK) // Fixed: Would increase bp forever and crash in case of timeouts...
+      if (__fitted_write(ip, bp, len, &written) != MSG_OK)
         return written;
-
       bp += len;
     }
 
-
-    /* wrtie tail */
+    /* write tail */
     len = n - written;
     if (len == 0)
       return written;
diff --git a/os/hal/src/usbh/hal_usbh_aoa.c b/os/hal/src/usbh/hal_usbh_aoa.c
index cb3fd18..a10ff2f 100644
--- a/os/hal/src/usbh/hal_usbh_aoa.c
+++ b/os/hal/src/usbh/hal_usbh_aoa.c
@@ -545,7 +545,7 @@ static void _vt(void *p) {
 		if ((aoacp->iq_counter == 0) && !usbhURBIsBusy(&aoacp->iq_urb)) {
 			_submitInI(aoacp);
 		}
-		chVTSetI(&aoacp->vt, MS2ST(16), _vt, aoacp);
+		chVTSetI(&aoacp->vt, OSAL_MS2I(16), _vt, aoacp);
 	}
 	osalSysUnlockFromISR();
 }
@@ -578,7 +578,7 @@ void usbhaoaChannelStart(USBHAOADriver *aoap) {
 	usbhURBSubmit(&aoacp->iq_urb);
 
 	chVTObjectInit(&aoacp->vt);
-	chVTSet(&aoacp->vt, MS2ST(16), _vt, aoacp);
+	chVTSet(&aoacp->vt, OSAL_MS2I(16), _vt, aoacp);
 
 	aoacp->state = USBHAOA_CHANNEL_STATE_READY;
 
diff --git a/os/hal/src/usbh/hal_usbh_ftdi.c b/os/hal/src/usbh/hal_usbh_ftdi.c
index 6fb556d..6966028 100644
--- a/os/hal/src/usbh/hal_usbh_ftdi.c
+++ b/os/hal/src/usbh/hal_usbh_ftdi.c
@@ -332,7 +332,7 @@ static usbh_urbstatus_t _ftdi_port_control(USBHFTDIPortDriver *ftdipp,
 			wLength
 	};
 
-	return usbhControlRequestExtended(ftdipp->ftdip->dev, &req, buff, NULL, MS2ST(1000));
+	return usbhControlRequestExtended(ftdipp->ftdip->dev, &req, buff, NULL, OSAL_MS2I(1000));
 }
 
 static uint32_t _get_divisor(uint32_t baud, usbhftdi_type_t type) {
@@ -394,7 +394,7 @@ static usbh_urbstatus_t _set_baudrate(USBHFTDIPortDriver *ftdipp, uint32_t baudr
 		wIndex,
 		0
 	};
-	return usbhControlRequestExtended(ftdipp->ftdip->dev, &req, NULL, NULL, MS2ST(1000));
+	return usbhControlRequestExtended(ftdipp->ftdip->dev, &req, NULL, NULL, OSAL_MS2I(1000));
 }
 
 
@@ -610,7 +610,7 @@ static void _vt(void *p) {
 	if ((ftdipp->iq_counter == 0) && !usbhURBIsBusy(&ftdipp->iq_urb)) {
 		_submitInI(ftdipp);
 	}
-	chVTSetI(&ftdipp->vt, MS2ST(16), _vt, ftdipp);
+	chVTSetI(&ftdipp->vt, OSAL_MS2I(16), _vt, ftdipp);
 	osalSysUnlockFromISR();
 }
 
@@ -690,7 +690,7 @@ void usbhftdipStart(USBHFTDIPortDriver *ftdipp, const USBHFTDIPortConfig *config
 	usbhURBSubmit(&ftdipp->iq_urb);
 
 	chVTObjectInit(&ftdipp->vt);
-	chVTSet(&ftdipp->vt, MS2ST(16), _vt, ftdipp);
+	chVTSet(&ftdipp->vt, OSAL_MS2I(16), _vt, ftdipp);
 
 	ftdipp->state = USBHFTDIP_STATE_READY;
 	osalMutexUnlock(&ftdipp->ftdip->mtx);
diff --git a/os/hal/src/usbh/hal_usbh_msd.c b/os/hal/src/usbh/hal_usbh_msd.c
index 069c47b..7233a0b 100644
--- a/os/hal/src/usbh/hal_usbh_msd.c
+++ b/os/hal/src/usbh/hal_usbh_msd.c
@@ -304,7 +304,7 @@ static msd_bot_result_t _msd_bot_transaction(msd_transaction_t *tran, USBHMassSt
 
 	/* control phase */
 	status = usbhBulkTransfer(&lunp->msdp->epout, tran->cbw,
-					sizeof(*tran->cbw), &actual_len, MS2ST(1000));
+					sizeof(*tran->cbw), &actual_len, OSAL_MS2I(1000));
 
 	if (status == USBH_URBSTATUS_CANCELLED) {
 		uerr("\tMSD: Control phase: USBH_URBSTATUS_CANCELLED");
@@ -327,7 +327,7 @@ static msd_bot_result_t _msd_bot_transaction(msd_transaction_t *tran, USBHMassSt
 				ep,
 				data,
 				tran->cbw->dCBWDataTransferLength,
-				&data_actual_len, MS2ST(20000));
+				&data_actual_len, OSAL_MS2I(20000));
 
 		if (status == USBH_URBSTATUS_CANCELLED) {
 			uerr("\tMSD: Data phase: USBH_URBSTATUS_CANCELLED");
@@ -349,7 +349,7 @@ static msd_bot_result_t _msd_bot_transaction(msd_transaction_t *tran, USBHMassSt
 
 	/* status phase */
 	status = usbhBulkTransfer(&lunp->msdp->epin, &csw,
-				sizeof(csw), &actual_len, MS2ST(1000));
+				sizeof(csw), &actual_len, OSAL_MS2I(1000));
 
 	if (status == USBH_URBSTATUS_STALL) {
 		uwarn("\tMSD: Status phase: USBH_URBSTATUS_STALL, clear halt and retry");
@@ -358,7 +358,7 @@ static msd_bot_result_t _msd_bot_transaction(msd_transaction_t *tran, USBHMassSt
 
 		if (status == USBH_URBSTATUS_OK) {
 			status = usbhBulkTransfer(&lunp->msdp->epin, &csw,
-						sizeof(csw), &actual_len, MS2ST(1000));
+						sizeof(csw), &actual_len, OSAL_MS2I(1000));
 		}
 	}