28 files changed, 149 insertions, 1933 deletions

diff --git a/os/various/chprintf.c b/os/various/chprintf.c
index 8c709bc4f..78453f52b 100644
--- a/os/various/chprintf.c
+++ b/os/various/chprintf.c
@@ -112,7 +112,7 @@ static char *ftoa(char *p, double num) {
 void chvprintf(BaseSequentialStream *chp, const char *fmt, va_list ap) {

   char *p, *s, c, filler;

   int i, precision, width;

-  bool_t is_long, left_align;

+  bool is_long, left_align;

   long l;

 #if CHPRINTF_USE_FLOAT

   float f;

diff --git a/os/various/chprintf.h b/os/various/chprintf.h
index 3444f216f..591f98130 100644
--- a/os/various/chprintf.h
+++ b/os/various/chprintf.h
@@ -66,7 +66,7 @@ extern "C" {
  *

  * @api

  */

-static INLINE void chprintf(BaseSequentialStream *chp, const char *fmt, ...) {

+static inline void chprintf(BaseSequentialStream *chp, const char *fmt, ...) {

   va_list ap;

 

   va_start(ap, fmt);

diff --git a/os/various/chrtclib.c b/os/various/chrtclib.c
index 9d3f4eb0c..f8a6a86ff 100644
--- a/os/various/chrtclib.c
+++ b/os/various/chrtclib.c
@@ -33,15 +33,10 @@
 

 #include "chrtclib.h"

 

-#if HAL_USE_RTC || defined(__DOXYGEN__)

-

-#if (defined(STM32F4XX) || defined(STM32F2XX) || defined(STM32L1XX) ||        \

-     defined(STM32F30X) || defined(STM32F37X) ||                              \

-     defined(STM32F1XX) || defined(STM32F10X_MD) || defined(STM32F10X_LD) ||  \

-     defined(STM32F10X_HD) || defined(STM32F10X_CL) || defined(STM32F0XX) ||  \

-     defined(LPC122X) || defined(LPC17XX) || defined(__DOXYGEN__))

-#if STM32_RTC_IS_CALENDAR || LPC17xx_RTC_IS_CALENDAR

-

+#if (defined(STM32F4XX) || defined(STM32F2XX) || defined(STM32L1XX) || \

+     defined(STM32F30X) || defined(STM32F37X) || \

+     defined(STM32F1XX) || defined(STM32F10X_MD) || defined(STM32F10X_LD) || \

+     defined(STM32F10X_HD) || defined(LPC122X) || defined(__DOXYGEN__))

 #if STM32_RTC_IS_CALENDAR

 /**

  * @brief   Converts from STM32 BCD to canonicalized time format.

@@ -139,47 +134,6 @@ static void stm32_rtc_tm2bcd(struct tm *timp, RTCTime *timespec) {
   timespec->tv_time |= ((v / 10) << RTC_TR_ST_OFFSET) & RTC_TR_ST;

   timespec->tv_time |= (v % 10) << RTC_TR_SU_OFFSET;

 }

-#endif

-

-#if LPC17xx_RTC_IS_CALENDAR

-/**

- * @brief   Converts from LPC17xx RTC format to canonicalized time format.

- *

- * @param[out] timp     pointer to a @p tm structure as defined in time.h

- * @param[in] timespec  pointer to a @p RTCTime structure

- *

- * @notapi

- */

-static void lpc17xx_rtc_format2tm(struct tm *timp, RTCTime *timespec) {

-  timp->tm_sec  = timespec->sec;

-  timp->tm_min  = timespec->min;

-  timp->tm_hour = timespec->hour;

-  timp->tm_mday = timespec->dom;

-  timp->tm_mon  = timespec->month - 1;

-  timp->tm_year = timespec->year - 1900;

-  timp->tm_wday = timespec->dow;

-  timp->tm_yday = timespec->doy - 1;

-}

-

-/**

- * @brief   Converts from LPC17xx RTC format to canonicalized time format.

- *

- * @param[out] timp     pointer to a @p tm structure as defined in time.h

- * @param[in] timespec  pointer to a @p RTCTime structure

- *

- * @notapi

- */

-static void lpc17xx_rtc_tm2format(struct tm *timp, RTCTime *timespec) {

-  timespec->sec   = timp->tm_sec;

-  timespec->min   = timp->tm_min;

-  timespec->hour  = timp->tm_hour;

-  timespec->dom   = timp->tm_mday;

-  timespec->month = timp->tm_mon + 1;

-  timespec->year  = timp->tm_year + 1900;

-  timespec->dow   = timp->tm_wday;

-  timespec->doy   = timp->tm_yday + 1;

-}

-#endif

 

 /**

  * @brief   Gets raw time from RTC and converts it to canonicalized format.

@@ -190,7 +144,6 @@ static void lpc17xx_rtc_tm2format(struct tm *timp, RTCTime *timespec) {
  * @api

  */

 void rtcGetTimeTm(RTCDriver *rtcp, struct tm *timp) {

-#if STM32_RTC_IS_CALENDAR

 #if STM32_RTC_HAS_SUBSECONDS

   RTCTime timespec = {0,0,FALSE,0};

 #else

@@ -199,14 +152,6 @@ void rtcGetTimeTm(RTCDriver *rtcp, struct tm *timp) {
 

   rtcGetTime(rtcp, &timespec);

   stm32_rtc_bcd2tm(timp, &timespec);

-#endif

-

-#if LPC17xx_RTC_IS_CALENDAR

-  RTCTime timespec;

-

-  rtcGetTime(rtcp, &timespec);

-  lpc17xx_rtc_format2tm(timp, &timespec);

-#endif

 }

 

 /**

@@ -218,7 +163,6 @@ void rtcGetTimeTm(RTCDriver *rtcp, struct tm *timp) {
  * @api

  */

 void rtcSetTimeTm(RTCDriver *rtcp, struct tm *timp) {

-#if STM32_RTC_IS_CALENDAR

 #if STM32_RTC_HAS_SUBSECONDS

   RTCTime timespec = {0,0,FALSE,0};

 #else

@@ -227,14 +171,6 @@ void rtcSetTimeTm(RTCDriver *rtcp, struct tm *timp) {
 

   stm32_rtc_tm2bcd(timp, &timespec);

   rtcSetTime(rtcp, &timespec);

-#endif

-

-#if LPC17xx_RTC_IS_CALENDAR

-  RTCTime timespec;

-

-  lpc17xx_rtc_tm2format(timp, &timespec);

-  rtcSetTime(rtcp, &timespec);

-#endif

 }

 

 /**

@@ -246,7 +182,6 @@ void rtcSetTimeTm(RTCDriver *rtcp, struct tm *timp) {
  * @api

  */

 time_t rtcGetTimeUnixSec(RTCDriver *rtcp) {

-#if STM32_RTC_IS_CALENDAR

 #if STM32_RTC_HAS_SUBSECONDS

   RTCTime timespec = {0,0,FALSE,0};

 #else

@@ -258,16 +193,6 @@ time_t rtcGetTimeUnixSec(RTCDriver *rtcp) {
   stm32_rtc_bcd2tm(&timp, &timespec);

 

   return mktime(&timp);

-#endif

-

-#if LPC17xx_RTC_IS_CALENDAR

-  RTCTime timespec;

-  struct tm timp;

-

-  rtcGetTime(rtcp, &timespec);

-  lpc17xx_rtc_format2tm(&timp, &timespec);

-  return mktime(&timp);

-#endif

 }

 

 /**

@@ -280,7 +205,6 @@ time_t rtcGetTimeUnixSec(RTCDriver *rtcp) {
  * @api

  */

 void rtcSetTimeUnixSec(RTCDriver *rtcp, time_t tv_sec) {

-#if STM32_RTC_IS_CALENDAR

 #if STM32_RTC_HAS_SUBSECONDS

   RTCTime timespec = {0,0,FALSE,0};

 #else

@@ -291,16 +215,6 @@ void rtcSetTimeUnixSec(RTCDriver *rtcp, time_t tv_sec) {
   localtime_r(&tv_sec, &timp);

   stm32_rtc_tm2bcd(&timp, &timespec);

   rtcSetTime(rtcp, &timespec);

-#endif

-

-#if LPC17xx_RTC_IS_CALENDAR

-  RTCTime timespec;

-  struct tm timp;

-

-  localtime_r(&tv_sec, &timp);

-  lpc17xx_rtc_tm2format(&timp, &timespec);

-  rtcSetTime(rtcp, &timespec);

-#endif

 }

 

 /**

@@ -439,9 +353,7 @@ uint32_t rtcGetTimeFatFromCounter(RTCDriver *rtcp) {
 

   return fattime;

 }

-#endif /* STM32_RTC_IS_CALENDAR  || LPC17xx_RTC_IS_CALENDAR */

+#endif /* STM32_RTC_IS_CALENDAR */

 #endif /* (defined(STM32F4XX) || defined(STM32F2XX) || defined(STM32L1XX) || defined(STM32F1XX)) */

 

-#endif /* HAL_USE_RTC */

-

 /** @} */

diff --git a/os/various/chrtclib.h b/os/various/chrtclib.h
index daf53ec85..895abc1a7 100644
--- a/os/various/chrtclib.h
+++ b/os/various/chrtclib.h
@@ -31,8 +31,6 @@
 

 #include <time.h>

 

-#if HAL_USE_RTC || defined(__DOXYGEN__)

-

 /*===========================================================================*/

 /* External declarations.                                                    */

 /*===========================================================================*/

@@ -52,8 +50,6 @@ extern "C" {
 }

 #endif

 

-#endif /* HAL_USE_RTC */

-

 #endif /* CHRTCLIB_H_ */

 

 /** @} */

diff --git a/os/various/cpp_wrappers/ch.cpp b/os/various/cpp_wrappers/ch.cpp
index 5f2621a61..32e22ad9d 100644
--- a/os/various/cpp_wrappers/ch.cpp
+++ b/os/various/cpp_wrappers/ch.cpp
@@ -92,7 +92,7 @@ namespace chibios_rt {
   void Timer::resetI() {

 

     if (chVTIsArmedI(&timer_ref))

-      chVTResetI(&timer_ref);

+      chVTDoResetI(&timer_ref);

   }

 

   bool Timer::isArmedI(void) {

diff --git a/os/various/devices_lib/accel/lis302dl.c b/os/various/devices_lib/accel/lis302dl.c
index 14e2a0ad1..77c2566ad 100644
--- a/os/various/devices_lib/accel/lis302dl.c
+++ b/os/various/devices_lib/accel/lis302dl.c
@@ -22,7 +22,6 @@
  * @{

  */

 

-#include "ch.h"

 #include "hal.h"

 #include "lis302dl.h"

 

@@ -81,7 +80,7 @@ void lis302dlWriteRegister(SPIDriver *spip, uint8_t reg, uint8_t value) {
   default:

     /* Reserved register must not be written, according to the datasheet

        this could permanently damage the device.*/

-    chDbgAssert(FALSE, "lis302dlWriteRegister(), #1", "reserved register");

+    osalDbgAssert(FALSE, "reserved register");

   case LIS302DL_WHO_AM_I:

   case LIS302DL_HP_FILTER_RESET:

   case LIS302DL_STATUS_REG:

diff --git a/os/various/devices_lib/accel/lis302dl.dox b/os/various/devices_lib/accel/lis302dl.dox
index 7b9530f10..02f51606a 100644
--- a/os/various/devices_lib/accel/lis302dl.dox
+++ b/os/various/devices_lib/accel/lis302dl.dox
@@ -1,17 +1,21 @@
 /*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

+    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010,

+                 2011,2012,2013 Giovanni Di Sirio.

 

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

+    This file is part of ChibiOS/RT.

 

-        http://www.apache.org/licenses/LICENSE-2.0

+    ChibiOS/RT is free software; you can redistribute it and/or modify

+    it under the terms of the GNU General Public License as published by

+    the Free Software Foundation; either version 3 of the License, or

+    (at your option) any later version.

 

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

+    ChibiOS/RT is distributed in the hope that it will be useful,

+    but WITHOUT ANY WARRANTY; without even the implied warranty of

+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+    GNU General Public License for more details.

+

+    You should have received a copy of the GNU General Public License

+    along with this program.  If not, see <http://www.gnu.org/licenses/>.

 */

 

 /**

diff --git a/os/various/evtimer.c b/os/various/evtimer.c
index a077529da..38c8cb872 100644
--- a/os/various/evtimer.c
+++ b/os/various/evtimer.c
@@ -25,40 +25,61 @@
 #include "ch.h"

 #include "evtimer.h"

 

+/*===========================================================================*/

+/* Module local definitions.                                                 */

+/*===========================================================================*/

+

+/*===========================================================================*/

+/* Module exported variables.                                                */

+/*===========================================================================*/

+

+/*===========================================================================*/

+/* Module local types.                                                       */

+/*===========================================================================*/

+

+/*===========================================================================*/

+/* Module local variables.                                                   */

+/*===========================================================================*/

+

+/*===========================================================================*/

+/* Module local functions.                                                   */

+/*===========================================================================*/

+

 static void tmrcb(void *p) {

-  EvTimer *etp = p;

+  event_timer_t *etp = p;

 

-  chSysLockFromIsr();

+  chSysLockFromISR();

   chEvtBroadcastI(&etp->et_es);

-  chVTSetI(&etp->et_vt, etp->et_interval, tmrcb, etp);

-  chSysUnlockFromIsr();

+  chVTDoSetI(&etp->et_vt, etp->et_interval, tmrcb, etp);

+  chSysUnlockFromISR();

 }

 

+/*===========================================================================*/

+/* Module exported functions.                                                */

+/*===========================================================================*/

+

 /**

- * @brief Starts the timer

- * @details If the timer was already running then the function has no effect.

+ * @brief Initializes an @p event_timer_t structure.

  *

- * @param etp pointer to an initialized @p EvTimer structure.

+ * @param[out] etp      the @p event_timer_t structure to be initialized

+ * @param[in] time      the interval in system ticks

  */

-void evtStart(EvTimer *etp) {

-

-  chSysLock();

+void evtObjectInit(event_timer_t *etp, systime_t time) {

 

-  if (!chVTIsArmedI(&etp->et_vt))

-    chVTSetI(&etp->et_vt, etp->et_interval, tmrcb, etp);

-

-  chSysUnlock();

+  chEvtObjectInit(&etp->et_es);

+  chVTObjectInit(&etp->et_vt);

+  etp->et_interval = time;

 }

 

 /**

- * @brief Stops the timer.

- * @details If the timer was already stopped then the function has no effect.

+ * @brief   Starts the timer

+ * @details If the timer was already running then the function has no effect.

  *

- * @param etp pointer to an initialized @p EvTimer structure.

+ * @param[in] etp       pointer to an initialized @p event_timer_t structure.

  */

-void evtStop(EvTimer *etp) {

+void evtStart(event_timer_t *etp) {

 

-  chVTReset(&etp->et_vt);

+  chVTSet(&etp->et_vt, etp->et_interval, tmrcb, etp);

 }

 

 /** @} */

diff --git a/os/various/evtimer.h b/os/various/evtimer.h
index 613c688a6..bb67691ba 100644
--- a/os/various/evtimer.h
+++ b/os/various/evtimer.h
@@ -25,42 +25,68 @@
 #ifndef _EVTIMER_H_

 #define _EVTIMER_H_

 

+/*===========================================================================*/

+/* Module constants.                                                         */

+/*===========================================================================*/

+

+/*===========================================================================*/

+/* Module pre-compile time settings.                                         */

+/*===========================================================================*/

+

+/*===========================================================================*/

+/* Derived constants and error checks.                                       */

+/*===========================================================================*/

 

 /*

  * Module dependencies check.

  */

-#if !CH_USE_EVENTS

-#error "Event Timers require CH_USE_EVENTS"

+#if !CH_CFG_USE_EVENTS

+#error "Event Timers require CH_CFG_USE_EVENTS"

 #endif

 

+/*===========================================================================*/

+/* Module data structures and types.                                         */

+/*===========================================================================*/

+

 /**

- * @brief Event timer structure.

+ * @brief   Type of a event timer structure.

  */

 typedef struct {

-  VirtualTimer  et_vt;

-  EventSource   et_es;

-  systime_t     et_interval;

-} EvTimer;

+  virtual_timer_t       et_vt;

+  event_source_t        et_es;

+  systime_t             et_interval;

+} event_timer_t;

+

+/*===========================================================================*/

+/* Module macros.                                                            */

+/*===========================================================================*/

+

+/*===========================================================================*/

+/* External declarations.                                                    */

+/*===========================================================================*/

 

 #ifdef __cplusplus

 extern "C" {

 #endif

-  void evtStart(EvTimer *etp);

-  void evtStop(EvTimer *etp);

+  void evtObjectInit(event_timer_t *etp, systime_t time);

+  void evtStart(event_timer_t *etp);

 #ifdef __cplusplus

 }

 #endif

 

+/*===========================================================================*/

+/* Module inline functions.                                                  */

+/*===========================================================================*/

+

 /**

- * @brief Initializes an @p EvTimer structure.

+ * @brief   Stops the timer.

+ * @details If the timer was already stopped then the function has no effect.

  *

- * @param etp the EvTimer structure to be initialized

- * @param time the interval in system ticks

+ * @param[in] etp       pointer to an initialized @p event_timer_t structure.

  */

-#define evtInit(etp, time) {                                            \

-  chEvtInit(&(etp)->et_es);                                             \

-  (etp)->et_vt.vt_func = NULL;                                          \

-  (etp)->et_interval = (time);                                          \

+static inline void vevtStop(event_timer_t *etp) {

+

+  chVTReset(&etp->et_vt);

 }

 

 #endif /* _EVTIMER_H_ */

diff --git a/os/various/fatfs_bindings/fatfs.mk b/os/various/fatfs_bindings/fatfs.mk
deleted file mode 100644
index 682091e00..000000000
--- a/os/various/fatfs_bindings/fatfs.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-# FATFS files.

-FATFSSRC = ${CHIBIOS}/os/various/fatfs_bindings/fatfs_diskio.c \

-           ${CHIBIOS}/os/various/fatfs_bindings/fatfs_syscall.c \

-           ${CHIBIOS}/ext/fatfs/src/ff.c \

-           ${CHIBIOS}/ext/fatfs/src/option/ccsbcs.c

-

-FATFSINC = ${CHIBIOS}/ext/fatfs/src

diff --git a/os/various/fatfs_bindings/fatfs_diskio.c b/os/various/fatfs_bindings/fatfs_diskio.c
deleted file mode 100644
index c724fa5f9..000000000
--- a/os/various/fatfs_bindings/fatfs_diskio.c
+++ /dev/null
@@ -1,254 +0,0 @@
-/*-----------------------------------------------------------------------*/

-/* Low level disk I/O module skeleton for FatFs     (C)ChaN, 2007        */

-/*-----------------------------------------------------------------------*/

-/* This is a stub disk I/O module that acts as front end of the existing */

-/* disk I/O modules and attach it to FatFs module with common interface. */

-/*-----------------------------------------------------------------------*/

-

-#include "ch.h"

-#include "hal.h"

-#include "ffconf.h"

-#include "diskio.h"

-

-#if HAL_USE_MMC_SPI && HAL_USE_SDC

-#error "cannot specify both MMC_SPI and SDC drivers"

-#endif

-

-#if HAL_USE_MMC_SPI

-extern MMCDriver MMCD1;

-#elif HAL_USE_SDC

-extern SDCDriver SDCD1;

-#else

-#error "MMC_SPI or SDC driver must be specified"

-#endif

-

-#if HAL_USE_RTC

-#include "chrtclib.h"

-extern RTCDriver RTCD1;

-#endif

-

-/*-----------------------------------------------------------------------*/

-/* Correspondence between physical drive number and physical drive.      */

-

-#define MMC     0

-#define SDC     0

-

-

-

-/*-----------------------------------------------------------------------*/

-/* Inidialize a Drive                                                    */

-

-DSTATUS disk_initialize (

-    BYTE drv                /* Physical drive nmuber (0..) */

-)

-{

-  DSTATUS stat;

-

-  switch (drv) {

-#if HAL_USE_MMC_SPI

-  case MMC:

-    stat = 0;

-    /* It is initialized externally, just reads the status.*/

-    if (blkGetDriverState(&MMCD1) != BLK_READY)

-      stat |= STA_NOINIT;

-    if (mmcIsWriteProtected(&MMCD1))

-      stat |=  STA_PROTECT;

-    return stat;

-#else

-  case SDC:

-    stat = 0;

-    /* It is initialized externally, just reads the status.*/

-    if (blkGetDriverState(&SDCD1) != BLK_READY)

-      stat |= STA_NOINIT;

-    if (sdcIsWriteProtected(&SDCD1))

-      stat |=  STA_PROTECT;

-    return stat;

-#endif

-  }

-  return STA_NODISK;

-}

-

-

-

-/*-----------------------------------------------------------------------*/

-/* Return Disk Status                                                    */

-

-DSTATUS disk_status (

-    BYTE drv        /* Physical drive nmuber (0..) */

-)

-{

-  DSTATUS stat;

-

-  switch (drv) {

-#if HAL_USE_MMC_SPI

-  case MMC:

-    stat = 0;

-    /* It is initialized externally, just reads the status.*/

-    if (blkGetDriverState(&MMCD1) != BLK_READY)

-      stat |= STA_NOINIT;

-    if (mmcIsWriteProtected(&MMCD1))

-      stat |= STA_PROTECT;

-    return stat;

-#else

-  case SDC:

-    stat = 0;

-    /* It is initialized externally, just reads the status.*/

-    if (blkGetDriverState(&SDCD1) != BLK_READY)

-      stat |= STA_NOINIT;

-    if (sdcIsWriteProtected(&SDCD1))

-      stat |= STA_PROTECT;

-    return stat;

-#endif

-  }

-  return STA_NODISK;

-}

-

-

-

-/*-----------------------------------------------------------------------*/

-/* Read Sector(s)                                                        */

-

-DRESULT disk_read (

-    BYTE drv,        /* Physical drive nmuber (0..) */

-    BYTE *buff,        /* Data buffer to store read data */

-    DWORD sector,    /* Sector address (LBA) */

-    BYTE count        /* Number of sectors to read (1..255) */

-)

-{

-  switch (drv) {

-#if HAL_USE_MMC_SPI

-  case MMC:

-    if (blkGetDriverState(&MMCD1) != BLK_READY)

-      return RES_NOTRDY;

-    if (mmcStartSequentialRead(&MMCD1, sector))

-      return RES_ERROR;

-    while (count > 0) {

-      if (mmcSequentialRead(&MMCD1, buff))

-        return RES_ERROR;

-      buff += MMCSD_BLOCK_SIZE;

-      count--;

-    }

-    if (mmcStopSequentialRead(&MMCD1))

-        return RES_ERROR;

-    return RES_OK;

-#else

-  case SDC:

-    if (blkGetDriverState(&SDCD1) != BLK_READY)

-      return RES_NOTRDY;

-    if (sdcRead(&SDCD1, sector, buff, count))

-      return RES_ERROR;

-    return RES_OK;

-#endif

-  }

-  return RES_PARERR;

-}

-

-

-

-/*-----------------------------------------------------------------------*/

-/* Write Sector(s)                                                       */

-

-#if _READONLY == 0

-DRESULT disk_write (

-    BYTE drv,            /* Physical drive nmuber (0..) */

-    const BYTE *buff,    /* Data to be written */

-    DWORD sector,        /* Sector address (LBA) */

-    BYTE count            /* Number of sectors to write (1..255) */

-)

-{

-  switch (drv) {

-#if HAL_USE_MMC_SPI

-  case MMC:

-    if (blkGetDriverState(&MMCD1) != BLK_READY)

-        return RES_NOTRDY;

-    if (mmcIsWriteProtected(&MMCD1))

-        return RES_WRPRT;

-    if (mmcStartSequentialWrite(&MMCD1, sector))

-        return RES_ERROR;

-    while (count > 0) {

-        if (mmcSequentialWrite(&MMCD1, buff))

-            return RES_ERROR;

-        buff += MMCSD_BLOCK_SIZE;

-        count--;

-    }

-    if (mmcStopSequentialWrite(&MMCD1))

-        return RES_ERROR;

-    return RES_OK;

-#else

-  case SDC:

-    if (blkGetDriverState(&SDCD1) != BLK_READY)

-      return RES_NOTRDY;

-    if (sdcWrite(&SDCD1, sector, buff, count))

-      return RES_ERROR;

-    return RES_OK;

-#endif

-  }

-  return RES_PARERR;

-}

-#endif /* _READONLY */

-

-

-

-/*-----------------------------------------------------------------------*/

-/* Miscellaneous Functions                                               */

-

-DRESULT disk_ioctl (

-    BYTE drv,        /* Physical drive nmuber (0..) */

-    BYTE ctrl,        /* Control code */

-    void *buff        /* Buffer to send/receive control data */

-)

-{

-  switch (drv) {

-#if HAL_USE_MMC_SPI

-  case MMC:

-    switch (ctrl) {

-    case CTRL_SYNC:

-        return RES_OK;

-    case GET_SECTOR_SIZE:

-        *((WORD *)buff) = MMCSD_BLOCK_SIZE;

-        return RES_OK;

-#if _USE_ERASE

-    case CTRL_ERASE_SECTOR:

-        mmcErase(&MMCD1, *((DWORD *)buff), *((DWORD *)buff + 1));

-        return RES_OK;

-#endif

-    default:

-        return RES_PARERR;

-    }

-#else

-  case SDC:

-    switch (ctrl) {

-    case CTRL_SYNC:

-        return RES_OK;

-    case GET_SECTOR_COUNT:

-        *((DWORD *)buff) = mmcsdGetCardCapacity(&SDCD1);

-        return RES_OK;

-    case GET_SECTOR_SIZE:

-        *((WORD *)buff) = MMCSD_BLOCK_SIZE;

-        return RES_OK;

-    case GET_BLOCK_SIZE:

-        *((DWORD *)buff) = 256; /* 512b blocks in one erase block */

-        return RES_OK;

-#if _USE_ERASE

-    case CTRL_ERASE_SECTOR:

-        sdcErase(&SDCD1, *((DWORD *)buff), *((DWORD *)buff + 1));

-        return RES_OK;

-#endif

-    default:

-        return RES_PARERR;

-    }

-#endif

-  }

-  return RES_PARERR;

-}

-

-DWORD get_fattime(void) {

-#if HAL_USE_RTC

-    return rtcGetTimeFat(&RTCD1);

-#else

-    return ((uint32_t)0 | (1 << 16)) | (1 << 21); /* wrong but valid time */

-#endif

-}

-

-

-

diff --git a/os/various/fatfs_bindings/fatfs_syscall.c b/os/various/fatfs_bindings/fatfs_syscall.c
deleted file mode 100644
index a42cbcffb..000000000
--- a/os/various/fatfs_bindings/fatfs_syscall.c
+++ /dev/null
@@ -1,84 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-/*------------------------------------------------------------------------*/

-/* Sample code of OS dependent controls for FatFs R0.08b                  */

-/* (C)ChaN, 2011                                                          */

-/*------------------------------------------------------------------------*/

-

-#include "ch.h"

-#include "ff.h"

-

-#if _FS_REENTRANT

-/*------------------------------------------------------------------------*/

-/* Static array of Synchronization Objects                                */

-/*------------------------------------------------------------------------*/

-static Semaphore ff_sem[_VOLUMES];

-

-/*------------------------------------------------------------------------*/

-/* Create a Synchronization Object                                        */

-/*------------------------------------------------------------------------*/

-int ff_cre_syncobj(BYTE vol, _SYNC_t *sobj) {

-

-  *sobj = &ff_sem[vol];

-  chSemInit(*sobj, 1);

-  return TRUE;

-}

-

-/*------------------------------------------------------------------------*/

-/* Delete a Synchronization Object                                        */

-/*------------------------------------------------------------------------*/

-int ff_del_syncobj(_SYNC_t sobj) {

-

-  chSemReset(sobj, 0);

-  return TRUE;

-}

-

-/*------------------------------------------------------------------------*/

-/* Request Grant to Access the Volume                                     */

-/*------------------------------------------------------------------------*/

-int ff_req_grant(_SYNC_t sobj) {

-

-  msg_t msg = chSemWaitTimeout(sobj, (systime_t)_FS_TIMEOUT);

-  return msg == RDY_OK;

-}

-

-/*------------------------------------------------------------------------*/

-/* Release Grant to Access the Volume                                     */

-/*------------------------------------------------------------------------*/

-void ff_rel_grant(_SYNC_t sobj) {

-

-  chSemSignal(sobj);

-}

-#endif /* _FS_REENTRANT */

-

-#if _USE_LFN == 3	/* LFN with a working buffer on the heap */

-/*------------------------------------------------------------------------*/

-/* Allocate a memory block                                                */

-/*------------------------------------------------------------------------*/

-void *ff_memalloc(UINT size) {

-

-  return chHeapAlloc(NULL, size);

-}

-

-/*------------------------------------------------------------------------*/

-/* Free a memory block                                                    */

-/*------------------------------------------------------------------------*/

-void ff_memfree(void *mblock) {

-

-  chHeapFree(mblock);

-}

-#endif /* _USE_LFN == 3 */

diff --git a/os/various/fatfs_bindings/readme.txt b/os/various/fatfs_bindings/readme.txt
deleted file mode 100644
index 8735cce54..000000000
--- a/os/various/fatfs_bindings/readme.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-This directory contains the ChibiOS/RT "official" bindings with the FatFS

-library by ChaN: http://elm-chan.org

-

-In order to use FatFS within ChibiOS/RT project, unzip FatFS under

-./ext/fatfs then include $(CHIBIOS)/os/various/fatfs_bindings/fatfs.mk

-in your makefile.

diff --git a/os/various/lwip_bindings/arch/cc.h b/os/various/lwip_bindings/arch/cc.h
deleted file mode 100644
index 87e900272..000000000
--- a/os/various/lwip_bindings/arch/cc.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-/*

- * **** This file incorporates work covered by the following copyright and ****

- * **** permission notice:                                                 ****

- *

- * Copyright (c) 2001-2004 Swedish Institute of Computer Science.

- * All rights reserved.

- *

- * Redistribution and use in source and binary forms, with or without modification,

- * are permitted provided that the following conditions are met:

- *

- * 1. Redistributions of source code must retain the above copyright notice,

- *    this list of conditions and the following disclaimer.

- * 2. Redistributions in binary form must reproduce the above copyright notice,

- *    this list of conditions and the following disclaimer in the documentation

- *    and/or other materials provided with the distribution.

- * 3. The name of the author may not be used to endorse or promote products

- *    derived from this software without specific prior written permission.

- *

- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED

- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF

- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT

- * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,

- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT

- * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS

- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN

- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING

- * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY

- * OF SUCH DAMAGE.

- *

- * This file is part of the lwIP TCP/IP stack.

- *

- * Author: Adam Dunkels <adam@sics.se>

- *

- */

-

-#ifndef __CC_H__

-#define __CC_H__

-

-#include <ch.h>

-

-typedef uint8_t         u8_t;

-typedef int8_t          s8_t;

-typedef uint16_t        u16_t;

-typedef int16_t         s16_t;

-typedef uint32_t        u32_t;

-typedef int32_t         s32_t;

-typedef uint32_t        mem_ptr_t;

-

-#define LWIP_PLATFORM_DIAG(x)

-#define LWIP_PLATFORM_ASSERT(x) {                                       \

-  chSysHalt();                                                          \

-}

-

-#define BYTE_ORDER LITTLE_ENDIAN

-#define LWIP_PROVIDE_ERRNO

-

-#endif /* __CC_H__ */

diff --git a/os/various/lwip_bindings/arch/perf.h b/os/various/lwip_bindings/arch/perf.h
deleted file mode 100644
index 81ef4673b..000000000
--- a/os/various/lwip_bindings/arch/perf.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-/*

- * **** This file incorporates work covered by the following copyright and ****

- * **** permission notice:                                                 ****

- *

- * Copyright (c) 2001-2004 Swedish Institute of Computer Science.

- * All rights reserved.

- *

- * Redistribution and use in source and binary forms, with or without modification,

- * are permitted provided that the following conditions are met:

- *

- * 1. Redistributions of source code must retain the above copyright notice,

- *    this list of conditions and the following disclaimer.

- * 2. Redistributions in binary form must reproduce the above copyright notice,

- *    this list of conditions and the following disclaimer in the documentation

- *    and/or other materials provided with the distribution.

- * 3. The name of the author may not be used to endorse or promote products

- *    derived from this software without specific prior written permission.

- *

- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED

- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF

- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT

- * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,

- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT

- * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS

- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN

- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING

- * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY

- * OF SUCH DAMAGE.

- *

- * This file is part of the lwIP TCP/IP stack.

- *

- * Author: Adam Dunkels <adam@sics.se>

- *

- */

-

-#ifndef __PERF_H__

-#define __PERF_H__

-

-#define PERF_START

-#define PERF_STOP(x)

-

-#endif /* __PERF_H__ */

diff --git a/os/various/lwip_bindings/arch/sys_arch.c b/os/various/lwip_bindings/arch/sys_arch.c
deleted file mode 100644
index 57ed14124..000000000
--- a/os/various/lwip_bindings/arch/sys_arch.c
+++ /dev/null
@@ -1,235 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-/*

- * **** This file incorporates work covered by the following copyright and ****

- * **** permission notice:                                                 ****

- *

- * Copyright (c) 2001-2004 Swedish Institute of Computer Science.

- * All rights reserved.

- *

- * Redistribution and use in source and binary forms, with or without modification,

- * are permitted provided that the following conditions are met:

- *

- * 1. Redistributions of source code must retain the above copyright notice,

- *    this list of conditions and the following disclaimer.

- * 2. Redistributions in binary form must reproduce the above copyright notice,

- *    this list of conditions and the following disclaimer in the documentation

- *    and/or other materials provided with the distribution.

- * 3. The name of the author may not be used to endorse or promote products

- *    derived from this software without specific prior written permission.

- *

- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED

- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF

- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT

- * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,

- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT

- * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS

- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN

- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING

- * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY

- * OF SUCH DAMAGE.

- *

- * This file is part of the lwIP TCP/IP stack.

- *

- * Author: Adam Dunkels <adam@sics.se>

- *

- */

-

-// see http://lwip.wikia.com/wiki/Porting_for_an_OS for instructions

-

-#include "ch.h"

-

-#include "lwip/opt.h"

-#include "lwip/mem.h"

-#include "lwip/sys.h"

-#include "lwip/stats.h"

-

-#include "arch/cc.h"

-#include "arch/sys_arch.h"

-

-void sys_init(void) {

-

-}

-

-err_t sys_sem_new(sys_sem_t *sem, u8_t count) {

-

-  *sem = chHeapAlloc(NULL, sizeof(Semaphore));

-  if (*sem == 0) {

-    SYS_STATS_INC(sem.err);

-    return ERR_MEM;

-  }

-  else {

-    chSemInit(*sem, (cnt_t)count);

-    SYS_STATS_INC_USED(sem);

-    return ERR_OK;

-  }

-}

-

-void sys_sem_free(sys_sem_t *sem) {

-

-  chHeapFree(*sem);

-  *sem = SYS_SEM_NULL;

-  SYS_STATS_DEC(sem.used);

-}

-

-void sys_sem_signal(sys_sem_t *sem) {

-

-  chSemSignal(*sem);

-}

-

-/* CHIBIOS FIX: specific variant of this call to be called from within

-   a lock.*/

-void sys_sem_signal_S(sys_sem_t *sem) {

-

-  chSemSignalI(*sem);

-  chSchRescheduleS();

-}

-

-u32_t sys_arch_sem_wait(sys_sem_t *sem, u32_t timeout) {

-  systime_t time, tmo;

-

-  chSysLock();

-  tmo = timeout > 0 ? (systime_t)timeout : TIME_INFINITE;

-  time = chTimeNow();

-  if (chSemWaitTimeoutS(*sem, tmo) != RDY_OK)

-    time = SYS_ARCH_TIMEOUT;

-  else

-    time = chTimeNow() - time;

-  chSysUnlock();

-  return time;

-}

-

-int sys_sem_valid(sys_sem_t *sem) {

-  return *sem != SYS_SEM_NULL;

-}

-

-// typically called within lwIP after freeing a semaphore

-// to make sure the pointer is not left pointing to invalid data

-void sys_sem_set_invalid(sys_sem_t *sem) {

-  *sem = SYS_SEM_NULL;

-}

-

-err_t sys_mbox_new(sys_mbox_t *mbox, int size) {

-  

-  *mbox = chHeapAlloc(NULL, sizeof(Mailbox) + sizeof(msg_t) * size);

-  if (*mbox == 0) {

-    SYS_STATS_INC(mbox.err);

-    return ERR_MEM;

-  }

-  else {

-    chMBInit(*mbox, (void *)(((uint8_t *)*mbox) + sizeof(Mailbox)), size);

-    SYS_STATS_INC(mbox.used);

-    return ERR_OK;

-  }

-}

-

-void sys_mbox_free(sys_mbox_t *mbox) {

-

-  if (chMBGetUsedCountI(*mbox) != 0) {

-    // If there are messages still present in the mailbox when the mailbox

-    // is deallocated, it is an indication of a programming error in lwIP

-    // and the developer should be notified.

-    SYS_STATS_INC(mbox.err);

-    chMBReset(*mbox);

-  }

-  chHeapFree(*mbox);

-  *mbox = SYS_MBOX_NULL;

-  SYS_STATS_DEC(mbox.used);

-}

-

-void sys_mbox_post(sys_mbox_t *mbox, void *msg) {

-

-  chMBPost(*mbox, (msg_t)msg, TIME_INFINITE);

-}

-

-err_t sys_mbox_trypost(sys_mbox_t *mbox, void *msg) {

-

-  if (chMBPost(*mbox, (msg_t)msg, TIME_IMMEDIATE) == RDY_TIMEOUT) {

-    SYS_STATS_INC(mbox.err);

-    return ERR_MEM;

-  }

-  return ERR_OK;

-}

-

-u32_t sys_arch_mbox_fetch(sys_mbox_t *mbox, void **msg, u32_t timeout) {

-  systime_t time, tmo;

-

-  chSysLock();

-  tmo = timeout > 0 ? (systime_t)timeout : TIME_INFINITE;

-  time = chTimeNow();

-  if (chMBFetchS(*mbox, (msg_t *)msg, tmo) != RDY_OK)

-    time = SYS_ARCH_TIMEOUT;

-  else

-    time = chTimeNow() - time;

-  chSysUnlock();

-  return time;

-}

-

-u32_t sys_arch_mbox_tryfetch(sys_mbox_t *mbox, void **msg) {

-

-  if (chMBFetch(*mbox, (msg_t *)msg, TIME_IMMEDIATE) == RDY_TIMEOUT)

-    return SYS_MBOX_EMPTY;

-  return 0;

-}

-

-int sys_mbox_valid(sys_mbox_t *mbox) {

-  return *mbox != SYS_MBOX_NULL;

-}

-

-// typically called within lwIP after freeing an mbox

-// to make sure the pointer is not left pointing to invalid data

-void sys_mbox_set_invalid(sys_mbox_t *mbox) {

-  *mbox = SYS_MBOX_NULL;

-}

-

-sys_thread_t sys_thread_new(const char *name, lwip_thread_fn thread,

-                            void *arg, int stacksize, int prio) {

-

-  size_t wsz;

-  void *wsp;

-

-  (void)name;

-  wsz = THD_WA_SIZE(stacksize);

-  wsp = chCoreAlloc(wsz);

-  if (wsp == NULL)

-    return NULL;

-  return (sys_thread_t)chThdCreateStatic(wsp, wsz, prio, (tfunc_t)thread, arg);

-}

-

-sys_prot_t sys_arch_protect(void) {

-

-  chSysLock();

-  return 0;

-}

-

-void sys_arch_unprotect(sys_prot_t pval) {

-

-  (void)pval;

-  chSysUnlock();

-}

-

-u32_t sys_now(void) {

-

-#if CH_FREQUENCY == 1000

-  return (u32_t)chTimeNow();

-#elif (CH_FREQUENCY / 1000) >= 1 && (CH_FREQUENCY % 1000) == 0

-  return ((u32_t)chTimeNow() - 1) / (CH_FREQUENCY / 1000) + 1;

-#elif (1000 / CH_FREQUENCY) >= 1 && (1000 % CH_FREQUENCY) == 0

-  return ((u32_t)chTimeNow() - 1) * (1000 / CH_FREQUENCY) + 1;

-#else

-  return (u32_t)(((u64_t)(chTimeNow() - 1) * 1000) / CH_FREQUENCY) + 1;

-#endif

-}

diff --git a/os/various/lwip_bindings/arch/sys_arch.h b/os/various/lwip_bindings/arch/sys_arch.h
deleted file mode 100644
index 6c10607f7..000000000
--- a/os/various/lwip_bindings/arch/sys_arch.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-/*

- * **** This file incorporates work covered by the following copyright and ****

- * **** permission notice:                                                 ****

- *

- * Copyright (c) 2001-2004 Swedish Institute of Computer Science.

- * All rights reserved.

- *

- * Redistribution and use in source and binary forms, with or without modification,

- * are permitted provided that the following conditions are met:

- *

- * 1. Redistributions of source code must retain the above copyright notice,

- *    this list of conditions and the following disclaimer.

- * 2. Redistributions in binary form must reproduce the above copyright notice,

- *    this list of conditions and the following disclaimer in the documentation

- *    and/or other materials provided with the distribution.

- * 3. The name of the author may not be used to endorse or promote products

- *    derived from this software without specific prior written permission.

- *

- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED

- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF

- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT

- * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,

- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT

- * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS

- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN

- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING

- * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY

- * OF SUCH DAMAGE.

- *

- * This file is part of the lwIP TCP/IP stack.

- *

- * Author: Adam Dunkels <adam@sics.se>

- *

- */

-

-#include <ch.h>

-

-#ifndef __SYS_ARCH_H__

-#define __SYS_ARCH_H__

-

-typedef Semaphore *     sys_sem_t;

-typedef Mailbox *       sys_mbox_t;

-typedef Thread *        sys_thread_t;

-typedef int             sys_prot_t;

-

-#define SYS_MBOX_NULL   (Mailbox *)0

-#define SYS_THREAD_NULL (Thread *)0

-#define SYS_SEM_NULL    (Semaphore *)0

-

-/* let sys.h use binary semaphores for mutexes */

-#define LWIP_COMPAT_MUTEX 1

-

-#endif /* __SYS_ARCH_H__ */

diff --git a/os/various/lwip_bindings/lwip.mk b/os/various/lwip_bindings/lwip.mk
deleted file mode 100644
index afaaf1454..000000000
--- a/os/various/lwip_bindings/lwip.mk
+++ /dev/null
@@ -1,54 +0,0 @@
-# List of the required lwIP files.

-LWIP = 	${CHIBIOS}/ext/lwip

-

-LWBINDSRC = \

-        $(CHIBIOS)/os/various/lwip_bindings/lwipthread.c \

-        $(CHIBIOS)/os/various/lwip_bindings/arch/sys_arch.c

-

-LWNETIFSRC = \

-        ${LWIP}/src/netif/etharp.c

-

-LWCORESRC = \

-        ${LWIP}/src/core/dhcp.c \

-        ${LWIP}/src/core/dns.c \

-        ${LWIP}/src/core/init.c \

-        ${LWIP}/src/core/mem.c \

-        ${LWIP}/src/core/memp.c \

-        ${LWIP}/src/core/netif.c \

-        ${LWIP}/src/core/pbuf.c \

-        ${LWIP}/src/core/raw.c \

-        ${LWIP}/src/core/stats.c \

-        ${LWIP}/src/core/sys.c \

-        ${LWIP}/src/core/tcp.c \

-        ${LWIP}/src/core/tcp_in.c \

-        ${LWIP}/src/core/tcp_out.c \

-        ${LWIP}/src/core/udp.c

-

-LWIPV4SRC = \

-        ${LWIP}/src/core/ipv4/autoip.c \

-        ${LWIP}/src/core/ipv4/icmp.c \

-        ${LWIP}/src/core/ipv4/igmp.c \

-        ${LWIP}/src/core/ipv4/inet.c \

-        ${LWIP}/src/core/ipv4/inet_chksum.c \

-        ${LWIP}/src/core/ipv4/ip.c \

-        ${LWIP}/src/core/ipv4/ip_addr.c \

-        ${LWIP}/src/core/ipv4/ip_frag.c \

-        ${LWIP}/src/core/def.c \

-        ${LWIP}/src/core/timers.c

-

-LWAPISRC = \

-        ${LWIP}/src/api/api_lib.c \

-        ${LWIP}/src/api/api_msg.c \

-        ${LWIP}/src/api/err.c \

-        ${LWIP}/src/api/netbuf.c \

-        ${LWIP}/src/api/netdb.c \

-        ${LWIP}/src/api/netifapi.c \

-        ${LWIP}/src/api/sockets.c \

-        ${LWIP}/src/api/tcpip.c

-

-LWSRC = $(LWBINDSRC) $(LWNETIFSRC) $(LWCORESRC) $(LWIPV4SRC) $(LWAPISRC)

-

-LWINC = \

-        $(CHIBIOS)/os/various/lwip_bindings \

-        ${LWIP}/src/include \

-        ${LWIP}/src/include/ipv4

diff --git a/os/various/lwip_bindings/lwipthread.c b/os/various/lwip_bindings/lwipthread.c
deleted file mode 100644
index 38ef8cfd2..000000000
--- a/os/various/lwip_bindings/lwipthread.c
+++ /dev/null
@@ -1,303 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-/*

- * **** This file incorporates work covered by the following copyright and ****

- * **** permission notice:                                                 ****

- *

- * Copyright (c) 2001-2004 Swedish Institute of Computer Science.

- * All rights reserved.

- *

- * Redistribution and use in source and binary forms, with or without modification,

- * are permitted provided that the following conditions are met:

- *

- * 1. Redistributions of source code must retain the above copyright notice,

- *    this list of conditions and the following disclaimer.

- * 2. Redistributions in binary form must reproduce the above copyright notice,

- *    this list of conditions and the following disclaimer in the documentation

- *    and/or other materials provided with the distribution.

- * 3. The name of the author may not be used to endorse or promote products

- *    derived from this software without specific prior written permission.

- *

- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED

- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF

- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT

- * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,

- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT

- * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS

- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN

- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING

- * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY

- * OF SUCH DAMAGE.

- *

- * This file is part of the lwIP TCP/IP stack.

- *

- * Author: Adam Dunkels <adam@sics.se>

- *

- */

-

-/**

- * @file lwipthread.c

- * @brief LWIP wrapper thread code.

- * @addtogroup LWIP_THREAD

- * @{

- */

-

-#include "ch.h"

-#include "hal.h"

-#include "evtimer.h"

-

-#include "lwipthread.h"

-

-#include "lwip/opt.h"

-

-#include "lwip/def.h"

-#include "lwip/mem.h"

-#include "lwip/pbuf.h"

-#include "lwip/sys.h"

-#include <lwip/stats.h>

-#include <lwip/snmp.h>

-#include <lwip/tcpip.h>

-#include "netif/etharp.h"

-#include "netif/ppp_oe.h"

-

-#define PERIODIC_TIMER_ID       1

-#define FRAME_RECEIVED_ID       2

-

-/**

- * Stack area for the LWIP-MAC thread.

- */

-WORKING_AREA(wa_lwip_thread, LWIP_THREAD_STACK_SIZE);

-

-/*

- * Initialization.

- */

-static void low_level_init(struct netif *netif) {

-  /* set MAC hardware address length */

-  netif->hwaddr_len = ETHARP_HWADDR_LEN;

-

-  /* maximum transfer unit */

-  netif->mtu = 1500;

-

-  /* device capabilities */

-  /* don't set NETIF_FLAG_ETHARP if this device is not an Ethernet one */

-  netif->flags = NETIF_FLAG_BROADCAST | NETIF_FLAG_ETHARP | NETIF_FLAG_LINK_UP;

-

-  /* Do whatever else is needed to initialize interface. */

-}

-

-/*

- * Transmits a frame.

- */

-static err_t low_level_output(struct netif *netif, struct pbuf *p) {

-  struct pbuf *q;

-  MACTransmitDescriptor td;

-

-  (void)netif;

-  if (macWaitTransmitDescriptor(&ETHD1, &td, MS2ST(LWIP_SEND_TIMEOUT)) != RDY_OK)

-    return ERR_TIMEOUT;

-

-#if ETH_PAD_SIZE

-  pbuf_header(p, -ETH_PAD_SIZE);        /* drop the padding word */

-#endif

-

-  /* Iterates through the pbuf chain. */

-  for(q = p; q != NULL; q = q->next)

-    macWriteTransmitDescriptor(&td, (uint8_t *)q->payload, (size_t)q->len);

-  macReleaseTransmitDescriptor(&td);

-

-#if ETH_PAD_SIZE

-  pbuf_header(p, ETH_PAD_SIZE);         /* reclaim the padding word */

-#endif

-

-  LINK_STATS_INC(link.xmit);

-

-  return ERR_OK;

-}

-

-/*

- * Receives a frame.

- */

-static struct pbuf *low_level_input(struct netif *netif) {

-  MACReceiveDescriptor rd;

-  struct pbuf *p, *q;

-  u16_t len;

-

-  (void)netif;

-  if (macWaitReceiveDescriptor(&ETHD1, &rd, TIME_IMMEDIATE) == RDY_OK) {

-    len = (u16_t)rd.size;

-

-#if ETH_PAD_SIZE

-    len += ETH_PAD_SIZE;        /* allow room for Ethernet padding */

-#endif

-

-    /* We allocate a pbuf chain of pbufs from the pool. */

-    p = pbuf_alloc(PBUF_RAW, len, PBUF_POOL);

-

-    if (p != NULL) {

-

-#if ETH_PAD_SIZE

-      pbuf_header(p, -ETH_PAD_SIZE); /* drop the padding word */

-#endif

-

-      /* Iterates through the pbuf chain. */

-      for(q = p; q != NULL; q = q->next)

-        macReadReceiveDescriptor(&rd, (uint8_t *)q->payload, (size_t)q->len);

-      macReleaseReceiveDescriptor(&rd);

-

-#if ETH_PAD_SIZE

-      pbuf_header(p, ETH_PAD_SIZE); /* reclaim the padding word */

-#endif

-

-      LINK_STATS_INC(link.recv);

-    }

-    else {

-      macReleaseReceiveDescriptor(&rd);

-      LINK_STATS_INC(link.memerr);

-      LINK_STATS_INC(link.drop);

-    }

-    return p;

-  }

-  return NULL;

-}

-

-/*

- * Initialization.

- */

-static err_t ethernetif_init(struct netif *netif) {

-#if LWIP_NETIF_HOSTNAME

-  /* Initialize interface hostname */

-  netif->hostname = "lwip";

-#endif /* LWIP_NETIF_HOSTNAME */

-

-  /*

-   * Initialize the snmp variables and counters inside the struct netif.

-   * The last argument should be replaced with your link speed, in units

-   * of bits per second.

-   */

-  NETIF_INIT_SNMP(netif, snmp_ifType_ethernet_csmacd, LWIP_LINK_SPEED);

-

-  netif->state = NULL;

-  netif->name[0] = LWIP_IFNAME0;

-  netif->name[1] = LWIP_IFNAME1;

-  /* We directly use etharp_output() here to save a function call.

-   * You can instead declare your own function an call etharp_output()

-   * from it if you have to do some checks before sending (e.g. if link

-   * is available...) */

-  netif->output = etharp_output;

-  netif->linkoutput = low_level_output;

-

-  /* initialize the hardware */

-  low_level_init(netif);

-

-  return ERR_OK;

-}

-

-/**

- * @brief LWIP handling thread.

- *

- * @param[in] p pointer to a @p lwipthread_opts structure or @p NULL

- * @return The function does not return.

- */

-msg_t lwip_thread(void *p) {

-  EvTimer evt;

-  EventListener el0, el1;

-  struct ip_addr ip, gateway, netmask;

-  static struct netif thisif;

-  static const MACConfig mac_config = {thisif.hwaddr};

-

-  chRegSetThreadName("lwipthread");

-

-  /* Initializes the thing.*/

-  tcpip_init(NULL, NULL);

-

-  /* TCP/IP parameters, runtime or compile time.*/

-  if (p) {

-    struct lwipthread_opts *opts = p;

-    unsigned i;

-

-    for (i = 0; i < 6; i++)

-      thisif.hwaddr[i] = opts->macaddress[i];

-    ip.addr = opts->address;

-    gateway.addr = opts->gateway;

-    netmask.addr = opts->netmask;

-  }

-  else {

-    thisif.hwaddr[0] = LWIP_ETHADDR_0;

-    thisif.hwaddr[1] = LWIP_ETHADDR_1;

-    thisif.hwaddr[2] = LWIP_ETHADDR_2;

-    thisif.hwaddr[3] = LWIP_ETHADDR_3;

-    thisif.hwaddr[4] = LWIP_ETHADDR_4;

-    thisif.hwaddr[5] = LWIP_ETHADDR_5;

-    LWIP_IPADDR(&ip);

-    LWIP_GATEWAY(&gateway);

-    LWIP_NETMASK(&netmask);

-  }

-  macStart(&ETHD1, &mac_config);

-  netif_add(&thisif, &ip, &netmask, &gateway, NULL, ethernetif_init, tcpip_input);

-

-  netif_set_default(&thisif);

-  netif_set_up(&thisif);

-

-  /* Setup event sources.*/

-  evtInit(&evt, LWIP_LINK_POLL_INTERVAL);

-  evtStart(&evt);

-  chEvtRegisterMask(&evt.et_es, &el0, PERIODIC_TIMER_ID);

-  chEvtRegisterMask(macGetReceiveEventSource(&ETHD1), &el1, FRAME_RECEIVED_ID);

-  chEvtAddEvents(PERIODIC_TIMER_ID | FRAME_RECEIVED_ID);

-

-  /* Goes to the final priority after initialization.*/

-  chThdSetPriority(LWIP_THREAD_PRIORITY);

-

-  while (TRUE) {

-    eventmask_t mask = chEvtWaitAny(ALL_EVENTS);

-    if (mask & PERIODIC_TIMER_ID) {

-      bool_t current_link_status = macPollLinkStatus(&ETHD1);

-      if (current_link_status != netif_is_link_up(&thisif)) {

-        if (current_link_status)

-          tcpip_callback_with_block((tcpip_callback_fn) netif_set_link_up,

-                                     &thisif, 0);

-        else

-          tcpip_callback_with_block((tcpip_callback_fn) netif_set_link_down,

-                                     &thisif, 0);

-      }

-    }

-    if (mask & FRAME_RECEIVED_ID) {

-      struct pbuf *p;

-      while ((p = low_level_input(&thisif)) != NULL) {

-        struct eth_hdr *ethhdr = p->payload;

-        switch (htons(ethhdr->type)) {

-        /* IP or ARP packet? */

-        case ETHTYPE_IP:

-        case ETHTYPE_ARP:

-#if PPPOE_SUPPORT

-        /* PPPoE packet? */

-        case ETHTYPE_PPPOEDISC:

-        case ETHTYPE_PPPOE:

-#endif /* PPPOE_SUPPORT */

-          /* full packet send to tcpip_thread to process */

-          if (thisif.input(p, &thisif) == ERR_OK)

-            break;

-          LWIP_DEBUGF(NETIF_DEBUG, ("ethernetif_input: IP input error\n"));

-        default:

-          pbuf_free(p);

-        }

-      }

-    }

-  }

-  return 0;

-}

-

-/** @} */

diff --git a/os/various/lwip_bindings/lwipthread.h b/os/various/lwip_bindings/lwipthread.h
deleted file mode 100644
index fe4de2870..000000000
--- a/os/various/lwip_bindings/lwipthread.h
+++ /dev/null
@@ -1,131 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-/**

- * @file lwipthread.h

- * @brief LWIP wrapper thread macros and structures.

- * @addtogroup LWIP_THREAD

- * @{

- */

-

-#ifndef _LWIPTHREAD_H_

-#define _LWIPTHREAD_H_

-

-#include <lwip/opt.h>

-

-/** @brief MAC thread priority.*/

-#ifndef LWIP_THREAD_PRIORITY

-#define LWIP_THREAD_PRIORITY                LOWPRIO

-#endif

-

-/** @brief MAC thread stack size. */

-#if !defined(LWIP_THREAD_STACK_SIZE) || defined(__DOXYGEN__)

-#define LWIP_THREAD_STACK_SIZE              512

-#endif

-

-/** @brief Link poll interval. */

-#if !defined(LWIP_LINK_POLL_INTERVAL) || defined(__DOXYGEN__)

-#define LWIP_LINK_POLL_INTERVAL             S2ST(5)

-#endif

-

-/** @brief IP Address. */

-#if !defined(LWIP_IPADDR) || defined(__DOXYGEN__)

-#define LWIP_IPADDR(p)                      IP4_ADDR(p, 192, 168, 1, 20)

-#endif

-

-/** @brief IP Gateway. */

-#if !defined(LWIP_GATEWAY) || defined(__DOXYGEN__)

-#define LWIP_GATEWAY(p)                     IP4_ADDR(p, 192, 168, 1, 1)

-#endif

-

-/** @brief IP netmask. */

-#if !defined(LWIP_NETMASK) || defined(__DOXYGEN__)

-#define LWIP_NETMASK(p)                     IP4_ADDR(p, 255, 255, 255, 0)

-#endif

-

-/** @brief Transmission timeout. */

-#if !defined(LWIP_SEND_TIMEOUT) || defined(__DOXYGEN__)

-#define LWIP_SEND_TIMEOUT                   50

-#endif

-

-/** @brief Link speed. */

-#if !defined(LWIP_LINK_SPEED) || defined(__DOXYGEN__)

-#define LWIP_LINK_SPEED                     100000000

-#endif

-

-/** @brief MAC Address byte 0. */

-#if !defined(LWIP_ETHADDR_0) || defined(__DOXYGEN__)

-#define LWIP_ETHADDR_0                      0xC2

-#endif

-

-/** @brief MAC Address byte 1. */

-#if !defined(LWIP_ETHADDR_1) || defined(__DOXYGEN__)

-#define LWIP_ETHADDR_1                      0xAF

-#endif

-

-/** @brief MAC Address byte 2. */

-#if !defined(LWIP_ETHADDR_2) || defined(__DOXYGEN__)

-#define LWIP_ETHADDR_2                      0x51

-#endif

-

-/** @brief MAC Address byte 3. */

-#if !defined(LWIP_ETHADDR_3) || defined(__DOXYGEN__)

-#define LWIP_ETHADDR_3                      0x03

-#endif

-

-/** @brief MAC Address byte 4. */

-#if !defined(LWIP_ETHADDR_4) || defined(__DOXYGEN__)

-#define LWIP_ETHADDR_4                      0xCF

-#endif

-

-/** @brief MAC Address byte 5. */

-#if !defined(LWIP_ETHADDR_5) || defined(__DOXYGEN__)

-#define LWIP_ETHADDR_5                      0x46

-#endif

-

-/** @brief Interface name byte 0. */

-#if !defined(LWIP_IFNAME0) || defined(__DOXYGEN__)

-#define LWIP_IFNAME0                        'm'

-#endif

-

-/** @brief Interface name byte 1. */

-#if !defined(LWIP_IFNAME1) || defined(__DOXYGEN__)

-#define LWIP_IFNAME1                        's'

-#endif

-

-/**

- * @brief Runtime TCP/IP settings.

- */

-struct lwipthread_opts {

-  uint8_t       *macaddress;

-  uint32_t      address;

-  uint32_t      netmask;

-  uint32_t      gateway;

-};

-

-extern WORKING_AREA(wa_lwip_thread, LWIP_THREAD_STACK_SIZE);

-

-#ifdef __cplusplus

-extern "C" {

-#endif

-  msg_t lwip_thread(void *p);

-#ifdef __cplusplus

-}

-#endif

-

-#endif /* _LWIPTHREAD_H_ */

-

-/** @} */

diff --git a/os/various/lwip_bindings/readme.txt b/os/various/lwip_bindings/readme.txt
deleted file mode 100644
index 8a7a89e8c..000000000
--- a/os/various/lwip_bindings/readme.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-This directory contains the ChibiOS/RT "official" bindings with the lwIP

-TCP/IP stack: http://savannah.nongnu.org/projects/lwip

-

-In order to use FatFS within ChibiOS/RT project, unzip FatFS under

-./ext/lwip-1.4.0 then include $(CHIBIOS)/os/various/lwip_bindings/lwip.mk

-in your makefile.

diff --git a/os/various/memstreams.c b/os/various/memstreams.c
index 11dd5b8ac..f7ba8b813 100644
--- a/os/various/memstreams.c
+++ b/os/various/memstreams.c
@@ -67,10 +67,10 @@ static msg_t put(void *ip, uint8_t b) {
   MemoryStream *msp = ip;

 

   if (msp->size - msp->eos <= 0)

-    return RDY_RESET;

+    return MSG_RESET;

   *(msp->buffer + msp->eos) = b;

   msp->eos += 1;

-  return RDY_OK;

+  return MSG_OK;

 }

 

 static msg_t get(void *ip) {

@@ -78,7 +78,7 @@ static msg_t get(void *ip) {
   MemoryStream *msp = ip;

 

   if (msp->eos - msp->offset <= 0)

-    return RDY_RESET;

+    return MSG_RESET;

   b = *(msp->buffer + msp->offset);

   msp->offset += 1;

   return b;

diff --git a/os/various/shell.c b/os/various/shell.c
index 839a4d16f..3aeb1e10a 100644
--- a/os/various/shell.c
+++ b/os/various/shell.c
@@ -32,7 +32,7 @@
 /**

  * @brief   Shell termination event source.

  */

-EventSource shell_terminated;

+event_source_t shell_terminated;

 

 static char *_strtok(char *str, const char *delim, char **saveptr) {

   char *token;

@@ -73,15 +73,15 @@ static void cmd_info(BaseSequentialStream *chp, int argc, char *argv[]) {
   }

 

   chprintf(chp, "Kernel:       %s\r\n", CH_KERNEL_VERSION);

-#ifdef CH_COMPILER_NAME

-  chprintf(chp, "Compiler:     %s\r\n", CH_COMPILER_NAME);

+#ifdef PORT_COMPILER_NAME

+  chprintf(chp, "Compiler:     %s\r\n", PORT_COMPILER_NAME);

 #endif

-  chprintf(chp, "Architecture: %s\r\n", CH_ARCHITECTURE_NAME);

-#ifdef CH_CORE_VARIANT_NAME

-  chprintf(chp, "Core Variant: %s\r\n", CH_CORE_VARIANT_NAME);

+  chprintf(chp, "Architecture: %s\r\n", PORT_ARCHITECTURE_NAME);

+#ifdef PORT_CORE_VARIANT_NAME

+  chprintf(chp, "Core Variant: %s\r\n", PORT_CORE_VARIANT_NAME);

 #endif

-#ifdef CH_PORT_INFO

-  chprintf(chp, "Port Info:    %s\r\n", CH_PORT_INFO);

+#ifdef PORT_INFO

+  chprintf(chp, "Port Info:    %s\r\n", PORT_INFO);

 #endif

 #ifdef PLATFORM_NAME

   chprintf(chp, "Platform:     %s\r\n", PLATFORM_NAME);

@@ -103,7 +103,7 @@ static void cmd_systime(BaseSequentialStream *chp, int argc, char *argv[]) {
     usage(chp, "systime");

     return;

   }

-  chprintf(chp, "%lu\r\n", (unsigned long)chTimeNow());

+  chprintf(chp, "%lu\r\n", (unsigned long)chVTGetSystemTime());

 }

 

 /**

@@ -115,7 +115,7 @@ static ShellCommand local_commands[] = {
   {NULL, NULL}

 };

 

-static bool_t cmdexec(const ShellCommand *scp, BaseSequentialStream *chp,

+static bool cmdexec(const ShellCommand *scp, BaseSequentialStream *chp,

                       char *name, int argc, char *argv[]) {

 

   while (scp->sc_name != NULL) {

@@ -133,10 +133,8 @@ static bool_t cmdexec(const ShellCommand *scp, BaseSequentialStream *chp,
  *

  * @param[in] p         pointer to a @p BaseSequentialStream object

  * @return              Termination reason.

- * @retval RDY_OK       terminated by command.

- * @retval RDY_RESET    terminated by reset condition on the I/O channel.

- *

- * @notapi

+ * @retval MSG_OK       terminated by command.

+ * @retval MSG_RESET    terminated by reset condition on the I/O channel.

  */

 static msg_t shell_thread(void *p) {

   int n;

@@ -191,7 +189,7 @@ static msg_t shell_thread(void *p) {
       }

     }

   }

-  shellExit(RDY_OK);

+  shellExit(MSG_OK);

   /* Never executed, silencing a warning.*/

   return 0;

 }

@@ -203,7 +201,7 @@ static msg_t shell_thread(void *p) {
  */

 void shellInit(void) {

 

-  chEvtInit(&shell_terminated);

+  chEvtObjectInit(&shell_terminated);

 }

 

 /**

@@ -226,7 +224,7 @@ void shellExit(msg_t msg) {
 

 /**

  * @brief   Spawns a new shell.

- * @pre     @p CH_USE_HEAP and @p CH_USE_DYNAMIC must be enabled.

+ * @pre     @p CH_CFG_USE_HEAP and @p CH_CFG_USE_DYNAMIC must be enabled.

  *

  * @param[in] scp       pointer to a @p ShellConfig object

  * @param[in] size      size of the shell working area to be allocated

@@ -236,8 +234,8 @@ void shellExit(msg_t msg) {
  *

  * @api

  */

-#if CH_USE_HEAP && CH_USE_DYNAMIC

-Thread *shellCreate(const ShellConfig *scp, size_t size, tprio_t prio) {

+#if CH_CFG_USE_HEAP && CH_CFG_USE_DYNAMIC

+thread_t *shellCreate(const ShellConfig *scp, size_t size, tprio_t prio) {

 

   return chThdCreateFromHeap(NULL, size, prio, shell_thread, (void *)scp);

 }

@@ -254,8 +252,8 @@ Thread *shellCreate(const ShellConfig *scp, size_t size, tprio_t prio) {
  *

  * @api

  */

-Thread *shellCreateStatic(const ShellConfig *scp, void *wsp,

-                          size_t size, tprio_t prio) {

+thread_t *shellCreateStatic(const ShellConfig *scp, void *wsp,

+                            size_t size, tprio_t prio) {

 

   return chThdCreateStatic(wsp, size, prio, shell_thread, (void *)scp);

 }

@@ -272,7 +270,7 @@ Thread *shellCreateStatic(const ShellConfig *scp, void *wsp,
  *

  * @api

  */

-bool_t shellGetLine(BaseSequentialStream *chp, char *line, unsigned size) {

+bool shellGetLine(BaseSequentialStream *chp, char *line, unsigned size) {

   char *p = line;

 

   while (TRUE) {

diff --git a/os/various/shell.h b/os/various/shell.h
index ef2676a74..d7a7dbc60 100644
--- a/os/various/shell.h
+++ b/os/various/shell.h
@@ -63,7 +63,7 @@ typedef struct {
 } ShellConfig;

 

 #if !defined(__DOXYGEN__)

-extern EventSource shell_terminated;

+extern event_source_t shell_terminated;

 #endif

 

 #ifdef __cplusplus

@@ -71,10 +71,10 @@ extern "C" {
 #endif

   void shellInit(void);

   void shellExit(msg_t msg);

-  Thread *shellCreate(const ShellConfig *scp, size_t size, tprio_t prio);

-  Thread *shellCreateStatic(const ShellConfig *scp, void *wsp,

-                            size_t size, tprio_t prio);

-  bool_t shellGetLine(BaseSequentialStream *chp, char *line, unsigned size);

+  thread_t *shellCreate(const ShellConfig *scp, size_t size, tprio_t prio);

+  thread_t *shellCreateStatic(const ShellConfig *scp, void *wsp,

+                              size_t size, tprio_t prio);

+  bool shellGetLine(BaseSequentialStream *chp, char *line, unsigned size);

 #ifdef __cplusplus

 }

 #endif

diff --git a/os/various/syscalls.c b/os/various/syscalls.c
index f19f733c7..41c04bac1 100644
--- a/os/various/syscalls.c
+++ b/os/various/syscalls.c
@@ -65,11 +65,6 @@
 #include "hal.h"

 #endif

 

-#ifndef __errno_r

-#include <sys/reent.h>

-#define __errno_r(reent) reent->_errno

-#endif

-

 /***************************************************************************/

 

 int _read_r(struct _reent *r, int file, char * ptr, int len)

@@ -134,10 +129,10 @@ int _close_r(struct _reent *r, int file)
 

 caddr_t _sbrk_r(struct _reent *r, int incr)

 {

-#if CH_USE_MEMCORE

+#if CH_CFG_USE_MEMCORE

   void *p;

 

-  chDbgCheck(incr > 0, "_sbrk_r");

+  chDbgCheck(incr > 0);

 

   p = chCoreAlloc((size_t)incr);

   if (p == NULL) {

diff --git a/os/various/usb_msc.c b/os/various/usb_msc.c
deleted file mode 100644
index 61f4202d3..000000000
--- a/os/various/usb_msc.c
+++ /dev/null
@@ -1,299 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-/*-*

- * @file    usb_msc.c

- * @brief   USB Mass Storage Class code.

- *

- * @addtogroup USB_MSC

- * @{

- */

-

-#include "ch.h"

-#include "hal.h"

-

-#include "usb_msc.h"

-

-/*===========================================================================*/

-/* Driver exported variables.                                                */

-/*===========================================================================*/

-

-/*===========================================================================*/

-/* Driver local variables.                                                   */

-/*===========================================================================*/

-

-/**

- * @brief   Zero-filled constant buffer.

- */

-static const uint8_t zerobuf[4] = {0, 0, 0, 0};

-

-/**

- * @brief   Answer to the INQUIRY command.

- */

-static const uint8_t scsi_inquiry_data[] = {

-  0x00,             /* Direct Access Device.      */

-  0x80,             /* RMB = 1: Removable Medium. */

-  0x02,             /* ISO, ECMA, ANSI = 2.       */

-  0x00,             /* UFI response format.       */

-

-  36 - 4,           /* Additional Length.         */

-  0x00,

-  0x00,

-  0x00,

-  /* Vendor Identification */

-  'C', 'h', 'i', 'b', 'i', 'O', 'S', ' ',

-  /* Product Identification */

-  'S', 'D', ' ', 'F', 'l', 'a', 's', 'h',

-  ' ', 'D', 'i', 's', 'k', ' ', ' ', ' ',

-  /* Product Revision Level */

-  '1', '.', '0', ' '

-};

-

-/**

- * @brief   Generic buffer.

- */

-uint8_t buf[16];

-

-/*===========================================================================*/

-/* MMC interface code.                                                       */

-/*===========================================================================*/

-

-/*===========================================================================*/

-/* SCSI emulation code.                                                      */

-/*===========================================================================*/

-

-static uint8_t scsi_read_format_capacities(uint32_t *nblocks,

-                                           uint32_t *secsize) {

-

-  *nblocks = 1024;

-  *secsize = 512;

-  return 3; /* No Media.*/

-}

-

-/*===========================================================================*/

-/* Mass Storage Class related code.                                          */

-/*===========================================================================*/

-

-/**

- * @brief   MSC state machine current state.

- */

-static mscstate_t msc_state;

-

-/**

- * @brief   Received CBW.

- */

-static msccbw_t CBW;

-

-/**

- * @brief   CSW to be transmitted.

- */

-static msccsw_t CSW;

-

-/**

- * @brief   MSC state machine initialization.

- *

- * @param[in] usbp      pointer to the @p USBDriver object

- */

-static void msc_reset(USBDriver *usbp) {

-

-  msc_state = MSC_IDLE;

-  chSysLockFromIsr();

-  usbStartReceiveI(usbp, MSC_DATA_OUT_EP, (uint8_t *)&CBW, sizeof CBW);

-  chSysUnlockFromIsr();

-}

-

-static void msc_transmit(USBDriver *usbp, const uint8_t *p, size_t n) {

-

-  if (n > CBW.dCBWDataTransferLength)

-    n = CBW.dCBWDataTransferLength;

-  CSW.dCSWDataResidue = CBW.dCBWDataTransferLength - (uint32_t)n;

-  chSysLockFromIsr();

-  usbStartTransmitI(usbp, MSC_DATA_IN_EP, p, n);

-  chSysUnlockFromIsr();

-}

-

-static void msc_sendstatus(USBDriver *usbp) {

-

-  msc_state = MSC_SENDING_CSW;

-  chSysLockFromIsr();

-  usbStartTransmitI(usbp, MSC_DATA_IN_EP, (uint8_t *)&CSW, sizeof CSW);

-  chSysUnlockFromIsr();

-}

-

-static bool_t msc_decode(USBDriver *usbp) {

-  uint32_t nblocks, secsize;

-

-  switch (CBW.CBWCB[0]) {

-  case SCSI_REQUEST_SENSE:

-    break;

-  case SCSI_INQUIRY:

-    msc_transmit(usbp, (uint8_t *)&scsi_inquiry_data,

-                 sizeof scsi_inquiry_data);

-    CSW.bCSWStatus = MSC_CSW_STATUS_PASSED;

-    break;

-  case SCSI_READ_FORMAT_CAPACITIES:

-    buf[8]  = scsi_read_format_capacities(&nblocks, &secsize);

-    buf[0]  = buf[1] = buf[2] = 0;

-    buf[3]  = 8;

-    buf[4]  = (uint8_t)(nblocks >> 24);

-    buf[5]  = (uint8_t)(nblocks >> 16);

-    buf[6]  = (uint8_t)(nblocks >> 8);

-    buf[7]  = (uint8_t)(nblocks >> 0);

-    buf[9]  = (uint8_t)(secsize >> 16);

-    buf[10] = (uint8_t)(secsize >> 8);

-    buf[11] = (uint8_t)(secsize >> 0);

-    msc_transmit(usbp, buf, 12);

-    CSW.bCSWStatus = MSC_CSW_STATUS_PASSED;

-    break;

-  default:

-    return TRUE;

-  }

-  return FALSE;

-}

-

-/*===========================================================================*/

-/* Driver exported functions.                                                */

-/*===========================================================================*/

-

-/**

- * @brief   Default requests hook.

- * @details The application must use this function as callback for the

- *          messages hook.

- *          The following requests are emulated:

- *          - MSC_GET_MAX_LUN_COMMAND.

- *          - MSC_MASS_STORAGE_RESET_COMMAND.

- *          .

- *

- * @param[in] usbp      pointer to the @p USBDriver object

- * @return              The hook status.

- * @retval TRUE         Message handled internally.

- * @retval FALSE        Message not handled.

- */

-bool_t mscRequestsHook(USBDriver *usbp) {

-

-  if ((usbp->setup[0] & (USB_RTYPE_TYPE_MASK | USB_RTYPE_RECIPIENT_MASK)) ==

-       (USB_RTYPE_TYPE_CLASS | USB_RTYPE_RECIPIENT_INTERFACE)) {

-    switch (usbp->setup[1]) {

-    case MSC_GET_MAX_LUN_COMMAND:

-      usbSetupTransfer(usbp, (uint8_t *)zerobuf, 1, NULL);

-      return TRUE;

-    case MSC_MASS_STORAGE_RESET_COMMAND:

-      msc_reset(usbp);

-      usbSetupTransfer(usbp, NULL, 0, NULL);

-      return TRUE;

-    default:

-      return FALSE;

-    }

-  }

-  return FALSE;

-}

-

-/**

- * @brief   Default data transmitted callback.

- * @details The application must use this function as callback for the IN

- *          data endpoint.

- *

- * @param[in] usbp      pointer to the @p USBDriver object

- * @param[in] ep        endpoint number

- */

-void mscDataTransmitted(USBDriver *usbp, usbep_t ep) {

-

-  switch (msc_state) {

-  case MSC_DATA_IN:

-    CSW.dCSWSignature = MSC_CSW_SIGNATURE;

-    CSW.dCSWTag = CBW.dCBWTag;

-    chSysLockFromIsr();

-    usbStartTransmitI(usbp, ep, (uint8_t *)&CSW, sizeof CSW);

-    chSysUnlockFromIsr();

-    msc_state = MSC_SENDING_CSW;

-    break;

-  case MSC_SENDING_CSW:

-    chSysLockFromIsr();

-    usbStartReceiveI(usbp, MSC_DATA_OUT_EP, (uint8_t *)&CBW, sizeof CBW);

-    chSysUnlockFromIsr();

-    msc_state = MSC_IDLE;

-    break;

-  default:

-    ;

-  }

-}

-

-/**

- * @brief   Default data received callback.

- * @details The application must use this function as callback for the OUT

- *          data endpoint.

- *

- * @param[in] usbp      pointer to the @p USBDriver object

- * @param[in] ep        endpoint number

- */

-void mscDataReceived(USBDriver *usbp, usbep_t ep) {

-  size_t n;

-

-  n = usbGetReceiveTransactionSizeI(usbp, ep);

-  switch (msc_state) {

-  case MSC_IDLE:

-    if ((n != sizeof(msccbw_t)) || (CBW.dCBWSignature != MSC_CBW_SIGNATURE))

-      goto stall_out; /* 6.6.1 */

-

-    /* Decoding SCSI command.*/

-    if (msc_decode(usbp)) {

-      if (CBW.dCBWDataTransferLength == 0) {

-        CSW.bCSWStatus = MSC_CSW_STATUS_FAILED;

-        CSW.dCSWDataResidue = 0;

-        msc_sendstatus(usbp);

-        return;

-      }

-      goto stall_both;

-    }

-

-    /* Commands with zero transfer length, 5.1.*/

-    if (CBW.dCBWDataTransferLength == 0) {

-      msc_sendstatus(usbp);

-      return;

-    }

-

-    /* Transfer direction.*/

-    if (CBW.bmCBWFlags & 0x80) {

-      /* IN, Device to Host.*/

-      msc_state = MSC_DATA_IN;

-    }

-    else {

-      /* OUT, Host to Device.*/

-      msc_state = MSC_DATA_OUT;

-    }

-    break;

-  case MSC_DATA_OUT:

-    break;

-  default:

-    ;

-  }

-  return;

-stall_out:

-  msc_state = MSC_ERROR;

-  chSysLockFromIsr();

-  usbStallReceiveI(usbp, ep);

-  chSysUnlockFromIsr();

-  return;

-stall_both:

-  msc_state = MSC_ERROR;

-  chSysLockFromIsr();

-  usbStallTransmitI(usbp, ep);

-  usbStallReceiveI(usbp, ep);

-  chSysUnlockFromIsr();

-  return;

-}

-

-/** @} */

diff --git a/os/various/usb_msc.h b/os/various/usb_msc.h
deleted file mode 100644
index 5e5a80c1f..000000000
--- a/os/various/usb_msc.h
+++ /dev/null
@@ -1,163 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

-

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

-

-        http://www.apache.org/licenses/LICENSE-2.0

-

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

-*/

-

-/*-*

- * @file    usb_msc.h

- * @brief   USB Mass Storage Class header.

- *

- * @addtogroup USB_MSC

- * @{

- */

-

-#ifndef _USB_MSC_H_

-#define _USB_MSC_H_

-

-/*===========================================================================*/

-/* Driver constants.                                                         */

-/*===========================================================================*/

-

-#define MSC_CBW_SIGNATURE               0x43425355

-#define MSC_CSW_SIGNATURE               0x53425355

-

-#define MSC_GET_MAX_LUN_COMMAND         0xFE

-#define MSC_MASS_STORAGE_RESET_COMMAND  0xFF

-

-#define MSC_CSW_STATUS_PASSED           0

-#define MSC_CSW_STATUS_FAILED           1

-#define MSC_CSW_STATUS_PHASE_ERROR      2

-

-

-#define SCSI_FORMAT_UNIT            0x04

-#define SCSI_INQUIRY                0x12

-#define SCSI_MODE_SELECT6           0x15

-#define SCSI_MODE_SELECT10          0x55

-#define SCSI_MODE_SENSE6            0x1A

-#define SCSI_MODE_SENSE10           0x5A

-#define SCSI_ALLOW_MEDIUM_REMOVAL   0x1E

-#define SCSI_READ6                  0x08

-#define SCSI_READ10                 0x28

-#define SCSI_READ12                 0xA8

-#define SCSI_READ16                 0x88

-

-#define SCSI_READ_CAPACITY10        0x25

-#define SCSI_READ_CAPACITY16        0x9E

-

-#define SCSI_REQUEST_SENSE          0x03

-#define SCSI_START_STOP_UNIT        0x1B

-#define SCSI_TEST_UNIT_READY        0x00

-#define SCSI_WRITE6                 0x0A

-#define SCSI_WRITE10                0x2A

-#define SCSI_WRITE12                0xAA

-#define SCSI_WRITE16                0x8A

-

-#define SCSI_VERIFY10               0x2F

-#define SCSI_VERIFY12               0xAF

-#define SCSI_VERIFY16               0x8F

-

-#define SCSI_SEND_DIAGNOSTIC        0x1D

-#define SCSI_READ_FORMAT_CAPACITIES 0x23

-

-/*===========================================================================*/

-/* Driver pre-compile time settings.                                         */

-/*===========================================================================*/

-

-/**

- * @brief   Endpoint number for bulk IN.

- */

-#if !defined(MSC_DATA_IN_EP) || defined(__DOXYGEN__)

-#define MSC_DATA_IN_EP          1

-#endif

-

-/**

- * @brief   Endpoint number for bulk OUT.

- */

-#if !defined(MSC_DATA_OUT_EP) || defined(__DOXYGEN__)

-#define MSC_DATA_OUT_EP         2

-#endif

-

-/*===========================================================================*/

-/* Derived constants and error checks.                                       */

-/*===========================================================================*/

-

-/*===========================================================================*/

-/* Driver data structures and types.                                         */

-/*===========================================================================*/

-

-/**

- * @brief   Type of the MSC possible states.

- */

-typedef enum {

-  MSC_IDLE = 0,

-  MSC_DATA_OUT,

-  MSC_DATA_IN,

-  MSC_SENDING_CSW,

-  MSC_ERROR

-} mscstate_t;

-

-/**

- * @brief   CBW structure.

- */

-struct CBW {

-  uint32_t          dCBWSignature;

-  uint32_t          dCBWTag;

-  uint32_t          dCBWDataTransferLength;

-  uint8_t           bmCBWFlags;

-  uint8_t           bCBWLUN;

-  uint8_t           bCBWCBLength;

-  uint8_t           CBWCB[16];

-};

-

-/**

- * @brief   CSW structure.

- */

-struct CSW {

-  uint32_t          dCSWSignature;

-  uint32_t          dCSWTag;

-  uint32_t          dCSWDataResidue;

-  uint8_t           bCSWStatus;

-};

-

-/**

- * @brief   Type of a CBW structure.

- */

-typedef struct CBW msccbw_t;

-

-/**

- * @brief   Type of a CSW structure.

- */

-typedef struct CSW msccsw_t;

-

-/*===========================================================================*/

-/* Driver macros.                                                            */

-/*===========================================================================*/

-

-/*===========================================================================*/

-/* External declarations.                                                    */

-/*===========================================================================*/

-

-#ifdef __cplusplus

-extern "C" {

-#endif

-  bool_t mscRequestsHook(USBDriver *usbp);

-  void mscDataTransmitted(USBDriver *usbp, usbep_t ep);

-  void mscDataReceived(USBDriver *usbp, usbep_t ep);

-#ifdef __cplusplus

-}

-#endif

-

-#endif  /* _USB_MSC_H_ */

-

-/** @} */

diff --git a/os/various/various.dox b/os/various/various.dox
index 488031886..57c37829c 100644
--- a/os/various/various.dox
+++ b/os/various/various.dox
@@ -1,17 +1,21 @@
 /*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

+    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010,

+                 2011,2012,2013 Giovanni Di Sirio.

 

-    Licensed under the Apache License, Version 2.0 (the "License");

-    you may not use this file except in compliance with the License.

-    You may obtain a copy of the License at

+    This file is part of ChibiOS/RT.

 

-        http://www.apache.org/licenses/LICENSE-2.0

+    ChibiOS/RT is free software; you can redistribute it and/or modify

+    it under the terms of the GNU General Public License as published by

+    the Free Software Foundation; either version 3 of the License, or

+    (at your option) any later version.

 

-    Unless required by applicable law or agreed to in writing, software

-    distributed under the License is distributed on an "AS IS" BASIS,

-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-    See the License for the specific language governing permissions and

-    limitations under the License.

+    ChibiOS/RT is distributed in the hope that it will be useful,

+    but WITHOUT ANY WARRANTY; without even the implied warranty of

+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+    GNU General Public License for more details.

+

+    You should have received a copy of the GNU General Public License

+    along with this program.  If not, see <http://www.gnu.org/licenses/>.

 */

 

 /**