Mass update of the Apache 2.0 license statement.

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

10 files changed, 994 insertions, 994 deletions

diff --git a/demos/STM32/RT-STM32-LWIP-FATFS-USB-HTTPS/cfg-stm32f746_discovery/chconf.h b/demos/STM32/RT-STM32-LWIP-FATFS-USB-HTTPS/cfg-stm32f746_discovery/chconf.h
index f2a2d72c3..9104e4551 100644
--- a/demos/STM32/RT-STM32-LWIP-FATFS-USB-HTTPS/cfg-stm32f746_discovery/chconf.h
+++ b/demos/STM32/RT-STM32-LWIP-FATFS-USB-HTTPS/cfg-stm32f746_discovery/chconf.h
@@ -1,5 +1,5 @@
 /*

-    ChibiOS - Copyright (C) 2006..2016 Giovanni Di Sirio

+    ChibiOS - Copyright (C) 2006..2018 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.

diff --git a/demos/STM32/RT-STM32-LWIP-FATFS-USB-HTTPS/cfg-stm32f746_discovery/halconf.h b/demos/STM32/RT-STM32-LWIP-FATFS-USB-HTTPS/cfg-stm32f746_discovery/halconf.h
index 97a71f639..0ef7c21c8 100644
--- a/demos/STM32/RT-STM32-LWIP-FATFS-USB-HTTPS/cfg-stm32f746_discovery/halconf.h
+++ b/demos/STM32/RT-STM32-LWIP-FATFS-USB-HTTPS/cfg-stm32f746_discovery/halconf.h
@@ -1,5 +1,5 @@
 /*

-    ChibiOS - Copyright (C) 2006..2016 Giovanni Di Sirio

+    ChibiOS - Copyright (C) 2006..2018 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.

diff --git a/demos/STM32/RT-STM32-LWIP-FATFS-USB-HTTPS/cfg-stm32f746_discovery/mcuconf.h b/demos/STM32/RT-STM32-LWIP-FATFS-USB-HTTPS/cfg-stm32f746_discovery/mcuconf.h
index 2b95f6ed1..31750430d 100644
--- a/demos/STM32/RT-STM32-LWIP-FATFS-USB-HTTPS/cfg-stm32f746_discovery/mcuconf.h
+++ b/demos/STM32/RT-STM32-LWIP-FATFS-USB-HTTPS/cfg-stm32f746_discovery/mcuconf.h
@@ -1,5 +1,5 @@
 /*

-    ChibiOS - Copyright (C) 2006..2016 Giovanni Di Sirio

+    ChibiOS - Copyright (C) 2006..2018 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.

diff --git a/demos/STM32/RT-STM32-LWIP-FATFS-USB-HTTPS/cfg-stm32f746_discovery/portab.c b/demos/STM32/RT-STM32-LWIP-FATFS-USB-HTTPS/cfg-stm32f746_discovery/portab.c
index a3fd920e9..5eb3b33f3 100644
--- a/demos/STM32/RT-STM32-LWIP-FATFS-USB-HTTPS/cfg-stm32f746_discovery/portab.c
+++ b/demos/STM32/RT-STM32-LWIP-FATFS-USB-HTTPS/cfg-stm32f746_discovery/portab.c
@@ -1,5 +1,5 @@
 /*

-    ChibiOS - Copyright (C) 2006..2016 Giovanni Di Sirio

+    ChibiOS - Copyright (C) 2006..2018 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.

diff --git a/demos/STM32/RT-STM32-LWIP-FATFS-USB-HTTPS/cfg-stm32f746_discovery/portab.h b/demos/STM32/RT-STM32-LWIP-FATFS-USB-HTTPS/cfg-stm32f746_discovery/portab.h
index 56e84c198..465ff26dc 100644
--- a/demos/STM32/RT-STM32-LWIP-FATFS-USB-HTTPS/cfg-stm32f746_discovery/portab.h
+++ b/demos/STM32/RT-STM32-LWIP-FATFS-USB-HTTPS/cfg-stm32f746_discovery/portab.h
@@ -1,5 +1,5 @@
 /*

-    ChibiOS - Copyright (C) 2006..2016 Giovanni Di Sirio

+    ChibiOS - Copyright (C) 2006..2018 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.

diff --git a/demos/STM32/RT-STM32-LWIP-FATFS-USB-HTTPS/main.c b/demos/STM32/RT-STM32-LWIP-FATFS-USB-HTTPS/main.c
index e9d4051d0..37aaa065f 100644
--- a/demos/STM32/RT-STM32-LWIP-FATFS-USB-HTTPS/main.c
+++ b/demos/STM32/RT-STM32-LWIP-FATFS-USB-HTTPS/main.c
@@ -1,348 +1,348 @@
-/*
-    ChibiOS - Copyright (C) 2006..2016 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.
-*/
-
-#include <stdio.h>
-#include <string.h>
-
-#include "ch.h"
-#include "hal.h"
-#include "rt_test_root.h"
-
-#include "chprintf.h"
-#include "shell.h"
-
-#include "lwipthread.h"
-#include "web/web.h"
-
-#include "ff.h"
-
-#include "portab.h"
-#include "usbcfg.h"
-
-/*===========================================================================*/
-/* Card insertion monitor.                                                   */
-/*===========================================================================*/
-
-#define POLLING_INTERVAL                10
-#define POLLING_DELAY                   10
-
-/**
- * @brief   Card monitor timer.
- */
-static virtual_timer_t tmr;
-
-/**
- * @brief   Debounce counter.
- */
-static unsigned cnt;
-
-/**
- * @brief   Card event sources.
- */
-static event_source_t inserted_event, removed_event;
-
-/**
- * @brief   Insertion monitor timer callback function.
- *
- * @param[in] p         pointer to the @p BaseBlockDevice object
- *
- * @notapi
- */
-static void tmrfunc(void *p) {
-  BaseBlockDevice *bbdp = p;
-
-  chSysLockFromISR();
-  if (cnt > 0) {
-    if (blkIsInserted(bbdp)) {
-      if (--cnt == 0) {
-        chEvtBroadcastI(&inserted_event);
-      }
-    }
-    else
-      cnt = POLLING_INTERVAL;
-  }
-  else {
-    if (!blkIsInserted(bbdp)) {
-      cnt = POLLING_INTERVAL;
-      chEvtBroadcastI(&removed_event);
-    }
-  }
-  chVTSetI(&tmr, TIME_MS2I(POLLING_DELAY), tmrfunc, bbdp);
-  chSysUnlockFromISR();
-}
-
-/**
- * @brief   Polling monitor start.
- *
- * @param[in] p         pointer to an object implementing @p BaseBlockDevice
- *
- * @notapi
- */
-static void tmr_init(void *p) {
-
-  chEvtObjectInit(&inserted_event);
-  chEvtObjectInit(&removed_event);
-  chSysLock();
-  cnt = POLLING_INTERVAL;
-  chVTSetI(&tmr, TIME_MS2I(POLLING_DELAY), tmrfunc, p);
-  chSysUnlock();
-}
-
-/*===========================================================================*/
-/* FatFs related.                                                            */
-/*===========================================================================*/
-
-/**
- * @brief FS object.
- */
-static FATFS SDC_FS;
-
-/* FS mounted and ready.*/
-static bool fs_ready = FALSE;
-
-/* Generic large buffer.*/
-static uint8_t fbuff[1024];
-
-static FRESULT scan_files(BaseSequentialStream *chp, char *path) {
-  static FILINFO fno;
-  FRESULT res;
-  DIR dir;
-  size_t i;
-  char *fn;
-
-  res = f_opendir(&dir, path);
-  if (res == FR_OK) {
-    i = strlen(path);
-    while (((res = f_readdir(&dir, &fno)) == FR_OK) && fno.fname[0]) {
-      if (FF_FS_RPATH && fno.fname[0] == '.')
-        continue;
-      fn = fno.fname;
-      if (fno.fattrib & AM_DIR) {
-        *(path + i) = '/';
-        strcpy(path + i + 1, fn);
-        res = scan_files(chp, path);
-        *(path + i) = '\0';
-        if (res != FR_OK)
-          break;
-      }
-      else {
-        chprintf(chp, "%s/%s\r\n", path, fn);
-      }
-    }
-  }
-  return res;
-}
-
-/*===========================================================================*/
-/* Command line related.                                                     */
-/*===========================================================================*/
-
-#define SHELL_WA_SIZE   THD_WORKING_AREA_SIZE(2048)
-
-static void cmd_tree(BaseSequentialStream *chp, int argc, char *argv[]) {
-  FRESULT err;
-  uint32_t fre_clust;
-  FATFS *fsp;
-
-  (void)argv;
-  if (argc > 0) {
-    chprintf(chp, "Usage: tree\r\n");
-    return;
-  }
-  if (!fs_ready) {
-    chprintf(chp, "File System not mounted\r\n");
-    return;
-  }
-  err = f_getfree("/", &fre_clust, &fsp);
-  if (err != FR_OK) {
-    chprintf(chp, "FS: f_getfree() failed\r\n");
-    return;
-  }
-  chprintf(chp,
-           "FS: %lu free clusters with %lu sectors (%lu bytes) per cluster\r\n",
-           fre_clust, (uint32_t)fsp->csize, (uint32_t)fsp->csize * 512);
-  fbuff[0] = 0;
-  scan_files(chp, (char *)fbuff);
-}
-
-static const ShellCommand commands[] = {
-  {"tree", cmd_tree},
-  {NULL, NULL}
-};
-
-static const ShellConfig shell_cfg1 = {
-  (BaseSequentialStream *)&PORTAB_SDU1,
-  commands
-};
-
-/*===========================================================================*/
-/* Main and generic code.                                                    */
-/*===========================================================================*/
-
-static thread_t *shelltp = NULL;
-
-/*
- * Card insertion event.
- */
-static void InsertHandler(eventid_t id) {
-  FRESULT err;
-
-  (void)id;
-  /*
-   * On insertion SDC initialization and FS mount.
-   */
-  if (sdcConnect(&SDCD1))
-    return;
-
-  err = f_mount(&SDC_FS, "/", 1);
-  if (err != FR_OK) {
-    sdcDisconnect(&SDCD1);
-    return;
-  }
-  fs_ready = TRUE;
-}
-
-/*
- * Card removal event.
- */
-static void RemoveHandler(eventid_t id) {
-
-  (void)id;
-  sdcDisconnect(&SDCD1);
-  fs_ready = FALSE;
-}
-
-/*
- * Shell exit event.
- */
-static void ShellHandler(eventid_t id) {
-
-  (void)id;
-  if (chThdTerminatedX(shelltp)) {
-    chThdRelease(shelltp);
-    shelltp = NULL;
-  }
-}
-
-/*
- * Green LED blinker thread, times are in milliseconds.
- */
-static THD_WORKING_AREA(waThread1, 128);
-static THD_FUNCTION(Thread1, arg) {
-
-  (void)arg;
-  chRegSetThreadName("blinker");
-  while (true) {
-    palToggleLine(PORTAB_BLINK_LED1);
-    chThdSleepMilliseconds(fs_ready ? 250 : 500);
-  }
-}
-
-/*
- * Application entry point.
- */
-int main(void) {
-  static const evhandler_t evhndl[] = {
-    InsertHandler,
-    RemoveHandler,
-    ShellHandler
-  };
-  event_listener_t el0, el1, el2;
-
-  /*
-   * System initializations.
-   * - HAL initialization, this also initializes the configured device drivers
-   *   and performs the board-specific initializations.
-   * - Kernel initialization, the main() function becomes a thread and the
-   *   RTOS is active.
-   * - lwIP subsystem initialization using the default configuration.
-   */
-  halInit();
-  chSysInit();
-
-  /*
-   * Initialize RNG
-   */
-  rccEnableAHB2(RCC_AHB2ENR_RNGEN, 0);
-  RNG->CR |= RNG_CR_IE;
-  RNG->CR |= RNG_CR_RNGEN;
-
-  /* lwip */
-  lwipInit(NULL);
-
-  /*
-   * Target-dependent setup code.
-   */
-  portab_setup();
-
-  /*
-   * Initializes a serial-over-USB CDC driver.
-   */
-  sduObjectInit(&PORTAB_SDU1);
-  sduStart(&PORTAB_SDU1, &serusbcfg);
-
-  /*
-   * Activates the USB driver and then the USB bus pull-up on D+.
-   * Note, a delay is inserted in order to not have to disconnect the cable
-   * after a reset.
-   */
-  usbDisconnectBus(serusbcfg.usbp);
-  chThdSleepMilliseconds(1500);
-  usbStart(serusbcfg.usbp, &usbcfg);
-  usbConnectBus(serusbcfg.usbp);
-
-  /*
-   * Shell manager initialization.
-   */
-  shellInit();
-
-  /*
-   * Activates the  SDC driver 1 using default configuration.
-   */
-  sdcStart(&SDCD1, NULL);
-
-  /*
-   * Activates the card insertion monitor.
-   */
-  tmr_init(&SDCD1);
-
-  /*
-   * Creates the blinker thread.
-   */
-  chThdCreateStatic(waThread1, sizeof(waThread1), NORMALPRIO, Thread1, NULL);
-
-  /*
-   * Creates the HTTPS thread (it changes priority internally).
-   */
-  chThdCreateStatic(wa_https_server, sizeof(wa_https_server), NORMALPRIO + 1,
-                    https_server, NULL);
-
-  /*
-   * Normal main() thread activity, handling SD card events and shell
-   * start/exit.
-   */
-  chEvtRegister(&inserted_event, &el0, 0);
-  chEvtRegister(&removed_event, &el1, 1);
-  chEvtRegister(&shell_terminated, &el2, 2);
-  while (true) {
-    if (!shelltp && (PORTAB_SDU1.config->usbp->state == USB_ACTIVE)) {
-      shelltp = chThdCreateFromHeap(NULL, SHELL_WA_SIZE,
-                                    "shell", NORMALPRIO + 1,
-                                    shellThread, (void *)&shell_cfg1);
-    }
-    chEvtDispatch(evhndl, chEvtWaitOneTimeout(ALL_EVENTS, TIME_MS2I(500)));
-  }
-}
+/*

+    ChibiOS - Copyright (C) 2006..2018 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.

+*/

+

+#include <stdio.h>

+#include <string.h>

+

+#include "ch.h"

+#include "hal.h"

+#include "rt_test_root.h"

+

+#include "chprintf.h"

+#include "shell.h"

+

+#include "lwipthread.h"

+#include "web/web.h"

+

+#include "ff.h"

+

+#include "portab.h"

+#include "usbcfg.h"

+

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

+/* Card insertion monitor.                                                   */

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

+

+#define POLLING_INTERVAL                10

+#define POLLING_DELAY                   10

+

+/**

+ * @brief   Card monitor timer.

+ */

+static virtual_timer_t tmr;

+

+/**

+ * @brief   Debounce counter.

+ */

+static unsigned cnt;

+

+/**

+ * @brief   Card event sources.

+ */

+static event_source_t inserted_event, removed_event;

+

+/**

+ * @brief   Insertion monitor timer callback function.

+ *

+ * @param[in] p         pointer to the @p BaseBlockDevice object

+ *

+ * @notapi

+ */

+static void tmrfunc(void *p) {

+  BaseBlockDevice *bbdp = p;

+

+  chSysLockFromISR();

+  if (cnt > 0) {

+    if (blkIsInserted(bbdp)) {

+      if (--cnt == 0) {

+        chEvtBroadcastI(&inserted_event);

+      }

+    }

+    else

+      cnt = POLLING_INTERVAL;

+  }

+  else {

+    if (!blkIsInserted(bbdp)) {

+      cnt = POLLING_INTERVAL;

+      chEvtBroadcastI(&removed_event);

+    }

+  }

+  chVTSetI(&tmr, TIME_MS2I(POLLING_DELAY), tmrfunc, bbdp);

+  chSysUnlockFromISR();

+}

+

+/**

+ * @brief   Polling monitor start.

+ *

+ * @param[in] p         pointer to an object implementing @p BaseBlockDevice

+ *

+ * @notapi

+ */

+static void tmr_init(void *p) {

+

+  chEvtObjectInit(&inserted_event);

+  chEvtObjectInit(&removed_event);

+  chSysLock();

+  cnt = POLLING_INTERVAL;

+  chVTSetI(&tmr, TIME_MS2I(POLLING_DELAY), tmrfunc, p);

+  chSysUnlock();

+}

+

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

+/* FatFs related.                                                            */

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

+

+/**

+ * @brief FS object.

+ */

+static FATFS SDC_FS;

+

+/* FS mounted and ready.*/

+static bool fs_ready = FALSE;

+

+/* Generic large buffer.*/

+static uint8_t fbuff[1024];

+

+static FRESULT scan_files(BaseSequentialStream *chp, char *path) {

+  static FILINFO fno;

+  FRESULT res;

+  DIR dir;

+  size_t i;

+  char *fn;

+

+  res = f_opendir(&dir, path);

+  if (res == FR_OK) {

+    i = strlen(path);

+    while (((res = f_readdir(&dir, &fno)) == FR_OK) && fno.fname[0]) {

+      if (FF_FS_RPATH && fno.fname[0] == '.')

+        continue;

+      fn = fno.fname;

+      if (fno.fattrib & AM_DIR) {

+        *(path + i) = '/';

+        strcpy(path + i + 1, fn);

+        res = scan_files(chp, path);

+        *(path + i) = '\0';

+        if (res != FR_OK)

+          break;

+      }

+      else {

+        chprintf(chp, "%s/%s\r\n", path, fn);

+      }

+    }

+  }

+  return res;

+}

+

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

+/* Command line related.                                                     */

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

+

+#define SHELL_WA_SIZE   THD_WORKING_AREA_SIZE(2048)

+

+static void cmd_tree(BaseSequentialStream *chp, int argc, char *argv[]) {

+  FRESULT err;

+  uint32_t fre_clust;

+  FATFS *fsp;

+

+  (void)argv;

+  if (argc > 0) {

+    chprintf(chp, "Usage: tree\r\n");

+    return;

+  }

+  if (!fs_ready) {

+    chprintf(chp, "File System not mounted\r\n");

+    return;

+  }

+  err = f_getfree("/", &fre_clust, &fsp);

+  if (err != FR_OK) {

+    chprintf(chp, "FS: f_getfree() failed\r\n");

+    return;

+  }

+  chprintf(chp,

+           "FS: %lu free clusters with %lu sectors (%lu bytes) per cluster\r\n",

+           fre_clust, (uint32_t)fsp->csize, (uint32_t)fsp->csize * 512);

+  fbuff[0] = 0;

+  scan_files(chp, (char *)fbuff);

+}

+

+static const ShellCommand commands[] = {

+  {"tree", cmd_tree},

+  {NULL, NULL}

+};

+

+static const ShellConfig shell_cfg1 = {

+  (BaseSequentialStream *)&PORTAB_SDU1,

+  commands

+};

+

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

+/* Main and generic code.                                                    */

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

+

+static thread_t *shelltp = NULL;

+

+/*

+ * Card insertion event.

+ */

+static void InsertHandler(eventid_t id) {

+  FRESULT err;

+

+  (void)id;

+  /*

+   * On insertion SDC initialization and FS mount.

+   */

+  if (sdcConnect(&SDCD1))

+    return;

+

+  err = f_mount(&SDC_FS, "/", 1);

+  if (err != FR_OK) {

+    sdcDisconnect(&SDCD1);

+    return;

+  }

+  fs_ready = TRUE;

+}

+

+/*

+ * Card removal event.

+ */

+static void RemoveHandler(eventid_t id) {

+

+  (void)id;

+  sdcDisconnect(&SDCD1);

+  fs_ready = FALSE;

+}

+

+/*

+ * Shell exit event.

+ */

+static void ShellHandler(eventid_t id) {

+

+  (void)id;

+  if (chThdTerminatedX(shelltp)) {

+    chThdRelease(shelltp);

+    shelltp = NULL;

+  }

+}

+

+/*

+ * Green LED blinker thread, times are in milliseconds.

+ */

+static THD_WORKING_AREA(waThread1, 128);

+static THD_FUNCTION(Thread1, arg) {

+

+  (void)arg;

+  chRegSetThreadName("blinker");

+  while (true) {

+    palToggleLine(PORTAB_BLINK_LED1);

+    chThdSleepMilliseconds(fs_ready ? 250 : 500);

+  }

+}

+

+/*

+ * Application entry point.

+ */

+int main(void) {

+  static const evhandler_t evhndl[] = {

+    InsertHandler,

+    RemoveHandler,

+    ShellHandler

+  };

+  event_listener_t el0, el1, el2;

+

+  /*

+   * System initializations.

+   * - HAL initialization, this also initializes the configured device drivers

+   *   and performs the board-specific initializations.

+   * - Kernel initialization, the main() function becomes a thread and the

+   *   RTOS is active.

+   * - lwIP subsystem initialization using the default configuration.

+   */

+  halInit();

+  chSysInit();

+

+  /*

+   * Initialize RNG

+   */

+  rccEnableAHB2(RCC_AHB2ENR_RNGEN, 0);

+  RNG->CR |= RNG_CR_IE;

+  RNG->CR |= RNG_CR_RNGEN;

+

+  /* lwip */

+  lwipInit(NULL);

+

+  /*

+   * Target-dependent setup code.

+   */

+  portab_setup();

+

+  /*

+   * Initializes a serial-over-USB CDC driver.

+   */

+  sduObjectInit(&PORTAB_SDU1);

+  sduStart(&PORTAB_SDU1, &serusbcfg);

+

+  /*

+   * Activates the USB driver and then the USB bus pull-up on D+.

+   * Note, a delay is inserted in order to not have to disconnect the cable

+   * after a reset.

+   */

+  usbDisconnectBus(serusbcfg.usbp);

+  chThdSleepMilliseconds(1500);

+  usbStart(serusbcfg.usbp, &usbcfg);

+  usbConnectBus(serusbcfg.usbp);

+

+  /*

+   * Shell manager initialization.

+   */

+  shellInit();

+

+  /*

+   * Activates the  SDC driver 1 using default configuration.

+   */

+  sdcStart(&SDCD1, NULL);

+

+  /*

+   * Activates the card insertion monitor.

+   */

+  tmr_init(&SDCD1);

+

+  /*

+   * Creates the blinker thread.

+   */

+  chThdCreateStatic(waThread1, sizeof(waThread1), NORMALPRIO, Thread1, NULL);

+

+  /*

+   * Creates the HTTPS thread (it changes priority internally).

+   */

+  chThdCreateStatic(wa_https_server, sizeof(wa_https_server), NORMALPRIO + 1,

+                    https_server, NULL);

+

+  /*

+   * Normal main() thread activity, handling SD card events and shell

+   * start/exit.

+   */

+  chEvtRegister(&inserted_event, &el0, 0);

+  chEvtRegister(&removed_event, &el1, 1);

+  chEvtRegister(&shell_terminated, &el2, 2);

+  while (true) {

+    if (!shelltp && (PORTAB_SDU1.config->usbp->state == USB_ACTIVE)) {

+      shelltp = chThdCreateFromHeap(NULL, SHELL_WA_SIZE,

+                                    "shell", NORMALPRIO + 1,

+                                    shellThread, (void *)&shell_cfg1);

+    }

+    chEvtDispatch(evhndl, chEvtWaitOneTimeout(ALL_EVENTS, TIME_MS2I(500)));

+  }

+}

diff --git a/demos/STM32/RT-STM32-LWIP-FATFS-USB-HTTPS/usbcfg.c b/demos/STM32/RT-STM32-LWIP-FATFS-USB-HTTPS/usbcfg.c
index 61d3553d8..1404b372f 100644
--- a/demos/STM32/RT-STM32-LWIP-FATFS-USB-HTTPS/usbcfg.c
+++ b/demos/STM32/RT-STM32-LWIP-FATFS-USB-HTTPS/usbcfg.c
@@ -1,343 +1,343 @@
-/*
-    ChibiOS - Copyright (C) 2006..2016 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.
-*/
-
-#include "hal.h"
-#include "portab.h"
-
-/* Virtual serial port over USB.*/
-SerialUSBDriver PORTAB_SDU1;
-
-/*
- * Endpoints to be used for USBD1.
- */
-#define USB1_DATA_REQUEST_EP            1
-#define USB1_DATA_AVAILABLE_EP          1
-#define USB1_INTERRUPT_REQUEST_EP       2
-
-/*
- * USB Device Descriptor.
- */
-static const uint8_t vcom_device_descriptor_data[18] = {
-  USB_DESC_DEVICE       (0x0110,        /* bcdUSB (1.1).                    */
-                         0x02,          /* bDeviceClass (CDC).              */
-                         0x00,          /* bDeviceSubClass.                 */
-                         0x00,          /* bDeviceProtocol.                 */
-                         0x40,          /* bMaxPacketSize.                  */
-                         0x0483,        /* idVendor (ST).                   */
-                         0x5740,        /* idProduct.                       */
-                         0x0200,        /* bcdDevice.                       */
-                         1,             /* iManufacturer.                   */
-                         2,             /* iProduct.                        */
-                         3,             /* iSerialNumber.                   */
-                         1)             /* bNumConfigurations.              */
-};
-
-/*
- * Device Descriptor wrapper.
- */
-static const USBDescriptor vcom_device_descriptor = {
-  sizeof vcom_device_descriptor_data,
-  vcom_device_descriptor_data
-};
-
-/* Configuration Descriptor tree for a CDC.*/
-static const uint8_t vcom_configuration_descriptor_data[67] = {
-  /* Configuration Descriptor.*/
-  USB_DESC_CONFIGURATION(67,            /* wTotalLength.                    */
-                         0x02,          /* bNumInterfaces.                  */
-                         0x01,          /* bConfigurationValue.             */
-                         0,             /* iConfiguration.                  */
-                         0xC0,          /* bmAttributes (self powered).     */
-                         50),           /* bMaxPower (100mA).               */
-  /* Interface Descriptor.*/
-  USB_DESC_INTERFACE    (0x00,          /* bInterfaceNumber.                */
-                         0x00,          /* bAlternateSetting.               */
-                         0x01,          /* bNumEndpoints.                   */
-                         0x02,          /* bInterfaceClass (Communications
-                                           Interface Class, CDC section
-                                           4.2).                            */
-                         0x02,          /* bInterfaceSubClass (Abstract
-                                         Control Model, CDC section 4.3).   */
-                         0x01,          /* bInterfaceProtocol (AT commands,
-                                           CDC section 4.4).                */
-                         0),            /* iInterface.                      */
-  /* Header Functional Descriptor (CDC section 5.2.3).*/
-  USB_DESC_BYTE         (5),            /* bLength.                         */
-  USB_DESC_BYTE         (0x24),         /* bDescriptorType (CS_INTERFACE).  */
-  USB_DESC_BYTE         (0x00),         /* bDescriptorSubtype (Header
-                                           Functional Descriptor.           */
-  USB_DESC_BCD          (0x0110),       /* bcdCDC.                          */
-  /* Call Management Functional Descriptor. */
-  USB_DESC_BYTE         (5),            /* bFunctionLength.                 */
-  USB_DESC_BYTE         (0x24),         /* bDescriptorType (CS_INTERFACE).  */
-  USB_DESC_BYTE         (0x01),         /* bDescriptorSubtype (Call Management
-                                           Functional Descriptor).          */
-  USB_DESC_BYTE         (0x00),         /* bmCapabilities (D0+D1).          */
-  USB_DESC_BYTE         (0x01),         /* bDataInterface.                  */
-  /* ACM Functional Descriptor.*/
-  USB_DESC_BYTE         (4),            /* bFunctionLength.                 */
-  USB_DESC_BYTE         (0x24),         /* bDescriptorType (CS_INTERFACE).  */
-  USB_DESC_BYTE         (0x02),         /* bDescriptorSubtype (Abstract
-                                           Control Management Descriptor).  */
-  USB_DESC_BYTE         (0x02),         /* bmCapabilities.                  */
-  /* Union Functional Descriptor.*/
-  USB_DESC_BYTE         (5),            /* bFunctionLength.                 */
-  USB_DESC_BYTE         (0x24),         /* bDescriptorType (CS_INTERFACE).  */
-  USB_DESC_BYTE         (0x06),         /* bDescriptorSubtype (Union
-                                           Functional Descriptor).          */
-  USB_DESC_BYTE         (0x00),         /* bMasterInterface (Communication
-                                           Class Interface).                */
-  USB_DESC_BYTE         (0x01),         /* bSlaveInterface0 (Data Class
-                                           Interface).                      */
-  /* Endpoint 2 Descriptor.*/
-  USB_DESC_ENDPOINT     (USB1_INTERRUPT_REQUEST_EP|0x80,
-                         0x03,          /* bmAttributes (Interrupt).        */
-                         0x0008,        /* wMaxPacketSize.                  */
-                         0xFF),         /* bInterval.                       */
-  /* Interface Descriptor.*/
-  USB_DESC_INTERFACE    (0x01,          /* bInterfaceNumber.                */
-                         0x00,          /* bAlternateSetting.               */
-                         0x02,          /* bNumEndpoints.                   */
-                         0x0A,          /* bInterfaceClass (Data Class
-                                           Interface, CDC section 4.5).     */
-                         0x00,          /* bInterfaceSubClass (CDC section
-                                           4.6).                            */
-                         0x00,          /* bInterfaceProtocol (CDC section
-                                           4.7).                            */
-                         0x00),         /* iInterface.                      */
-  /* Endpoint 3 Descriptor.*/
-  USB_DESC_ENDPOINT     (USB1_DATA_AVAILABLE_EP,       /* bEndpointAddress.*/
-                         0x02,          /* bmAttributes (Bulk).             */
-                         0x0040,        /* wMaxPacketSize.                  */
-                         0x00),         /* bInterval.                       */
-  /* Endpoint 1 Descriptor.*/
-  USB_DESC_ENDPOINT     (USB1_DATA_REQUEST_EP|0x80,    /* bEndpointAddress.*/
-                         0x02,          /* bmAttributes (Bulk).             */
-                         0x0040,        /* wMaxPacketSize.                  */
-                         0x00)          /* bInterval.                       */
-};
-
-/*
- * Configuration Descriptor wrapper.
- */
-static const USBDescriptor vcom_configuration_descriptor = {
-  sizeof vcom_configuration_descriptor_data,
-  vcom_configuration_descriptor_data
-};
-
-/*
- * U.S. English language identifier.
- */
-static const uint8_t vcom_string0[] = {
-  USB_DESC_BYTE(4),                     /* bLength.                         */
-  USB_DESC_BYTE(USB_DESCRIPTOR_STRING), /* bDescriptorType.                 */
-  USB_DESC_WORD(0x0409)                 /* wLANGID (U.S. English).          */
-};
-
-/*
- * Vendor string.
- */
-static const uint8_t vcom_string1[] = {
-  USB_DESC_BYTE(38),                    /* bLength.                         */
-  USB_DESC_BYTE(USB_DESCRIPTOR_STRING), /* bDescriptorType.                 */
-  'S', 0, 'T', 0, 'M', 0, 'i', 0, 'c', 0, 'r', 0, 'o', 0, 'e', 0,
-  'l', 0, 'e', 0, 'c', 0, 't', 0, 'r', 0, 'o', 0, 'n', 0, 'i', 0,
-  'c', 0, 's', 0
-};
-
-/*
- * Device Description string.
- */
-static const uint8_t vcom_string2[] = {
-  USB_DESC_BYTE(56),                    /* bLength.                         */
-  USB_DESC_BYTE(USB_DESCRIPTOR_STRING), /* bDescriptorType.                 */
-  'C', 0, 'h', 0, 'i', 0, 'b', 0, 'i', 0, 'O', 0, 'S', 0, '/', 0,
-  'R', 0, 'T', 0, ' ', 0, 'V', 0, 'i', 0, 'r', 0, 't', 0, 'u', 0,
-  'a', 0, 'l', 0, ' ', 0, 'C', 0, 'O', 0, 'M', 0, ' ', 0, 'P', 0,
-  'o', 0, 'r', 0, 't', 0
-};
-
-/*
- * Serial Number string.
- */
-static const uint8_t vcom_string3[] = {
-  USB_DESC_BYTE(8),                     /* bLength.                         */
-  USB_DESC_BYTE(USB_DESCRIPTOR_STRING), /* bDescriptorType.                 */
-  '0' + CH_KERNEL_MAJOR, 0,
-  '0' + CH_KERNEL_MINOR, 0,
-  '0' + CH_KERNEL_PATCH, 0
-};
-
-/*
- * Strings wrappers array.
- */
-static const USBDescriptor vcom_strings[] = {
-  {sizeof vcom_string0, vcom_string0},
-  {sizeof vcom_string1, vcom_string1},
-  {sizeof vcom_string2, vcom_string2},
-  {sizeof vcom_string3, vcom_string3}
-};
-
-/*
- * Handles the GET_DESCRIPTOR callback. All required descriptors must be
- * handled here.
- */
-static const USBDescriptor *get_descriptor(USBDriver *usbp,
-                                           uint8_t dtype,
-                                           uint8_t dindex,
-                                           uint16_t lang) {
-
-  (void)usbp;
-  (void)lang;
-  switch (dtype) {
-  case USB_DESCRIPTOR_DEVICE:
-    return &vcom_device_descriptor;
-  case USB_DESCRIPTOR_CONFIGURATION:
-    return &vcom_configuration_descriptor;
-  case USB_DESCRIPTOR_STRING:
-    if (dindex < 4)
-      return &vcom_strings[dindex];
-  }
-  return NULL;
-}
-
-/**
- * @brief   IN EP1 state.
- */
-static USBInEndpointState ep1instate;
-
-/**
- * @brief   OUT EP1 state.
- */
-static USBOutEndpointState ep1outstate;
-
-/**
- * @brief   EP1 initialization structure (both IN and OUT).
- */
-static const USBEndpointConfig ep1config = {
-  USB_EP_MODE_TYPE_BULK,
-  NULL,
-  sduDataTransmitted,
-  sduDataReceived,
-  0x0040,
-  0x0040,
-  &ep1instate,
-  &ep1outstate,
-  2,
-  NULL
-};
-
-/**
- * @brief   IN EP2 state.
- */
-static USBInEndpointState ep2instate;
-
-/**
- * @brief   EP2 initialization structure (IN only).
- */
-static const USBEndpointConfig ep2config = {
-  USB_EP_MODE_TYPE_INTR,
-  NULL,
-  sduInterruptTransmitted,
-  NULL,
-  0x0010,
-  0x0000,
-  &ep2instate,
-  NULL,
-  1,
-  NULL
-};
-
-/*
- * Handles the USB driver global events.
- */
-static void usb_event(USBDriver *usbp, usbevent_t event) {
-  extern SerialUSBDriver PORTAB_SDU1;
-
-  switch (event) {
-  case USB_EVENT_ADDRESS:
-    return;
-  case USB_EVENT_CONFIGURED:
-    chSysLockFromISR();
-
-    /* Enables the endpoints specified into the configuration.
-       Note, this callback is invoked from an ISR so I-Class functions
-       must be used.*/
-    usbInitEndpointI(usbp, USB1_DATA_REQUEST_EP, &ep1config);
-    usbInitEndpointI(usbp, USB1_INTERRUPT_REQUEST_EP, &ep2config);
-
-    /* Resetting the state of the CDC subsystem.*/
-    sduConfigureHookI(&PORTAB_SDU1);
-
-    chSysUnlockFromISR();
-    return;
-  case USB_EVENT_RESET:
-    /* Falls into.*/
-  case USB_EVENT_UNCONFIGURED:
-    /* Falls into.*/
-  case USB_EVENT_SUSPEND:
-    chSysLockFromISR();
-
-    /* Disconnection event on suspend.*/
-    sduSuspendHookI(&PORTAB_SDU1);
-
-    chSysUnlockFromISR();
-    return;
-  case USB_EVENT_WAKEUP:
-    chSysLockFromISR();
-
-    /* Disconnection event on suspend.*/
-    sduWakeupHookI(&PORTAB_SDU1);
-
-    chSysUnlockFromISR();
-    return;
-  case USB_EVENT_STALLED:
-    return;
-  }
-  return;
-}
-
-/*
- * Handles the USB driver global events.
- */
-static void sof_handler(USBDriver *usbp) {
-
-  (void)usbp;
-
-  osalSysLockFromISR();
-  sduSOFHookI(&PORTAB_SDU1);
-  osalSysUnlockFromISR();
-}
-
-/*
- * USB driver configuration.
- */
-const USBConfig usbcfg = {
-  usb_event,
-  get_descriptor,
-  sduRequestsHook,
-  sof_handler
-};
-
-/*
- * Serial over USB driver configuration.
- */
-const SerialUSBConfig serusbcfg = {
-  &PORTAB_USB1,
-  USB1_DATA_REQUEST_EP,
-  USB1_DATA_AVAILABLE_EP,
-  USB1_INTERRUPT_REQUEST_EP
-};
+/*

+    ChibiOS - Copyright (C) 2006..2018 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.

+*/

+

+#include "hal.h"

+#include "portab.h"

+

+/* Virtual serial port over USB.*/

+SerialUSBDriver PORTAB_SDU1;

+

+/*

+ * Endpoints to be used for USBD1.

+ */

+#define USB1_DATA_REQUEST_EP            1

+#define USB1_DATA_AVAILABLE_EP          1

+#define USB1_INTERRUPT_REQUEST_EP       2

+

+/*

+ * USB Device Descriptor.

+ */

+static const uint8_t vcom_device_descriptor_data[18] = {

+  USB_DESC_DEVICE       (0x0110,        /* bcdUSB (1.1).                    */

+                         0x02,          /* bDeviceClass (CDC).              */

+                         0x00,          /* bDeviceSubClass.                 */

+                         0x00,          /* bDeviceProtocol.                 */

+                         0x40,          /* bMaxPacketSize.                  */

+                         0x0483,        /* idVendor (ST).                   */

+                         0x5740,        /* idProduct.                       */

+                         0x0200,        /* bcdDevice.                       */

+                         1,             /* iManufacturer.                   */

+                         2,             /* iProduct.                        */

+                         3,             /* iSerialNumber.                   */

+                         1)             /* bNumConfigurations.              */

+};

+

+/*

+ * Device Descriptor wrapper.

+ */

+static const USBDescriptor vcom_device_descriptor = {

+  sizeof vcom_device_descriptor_data,

+  vcom_device_descriptor_data

+};

+

+/* Configuration Descriptor tree for a CDC.*/

+static const uint8_t vcom_configuration_descriptor_data[67] = {

+  /* Configuration Descriptor.*/

+  USB_DESC_CONFIGURATION(67,            /* wTotalLength.                    */

+                         0x02,          /* bNumInterfaces.                  */

+                         0x01,          /* bConfigurationValue.             */

+                         0,             /* iConfiguration.                  */

+                         0xC0,          /* bmAttributes (self powered).     */

+                         50),           /* bMaxPower (100mA).               */

+  /* Interface Descriptor.*/

+  USB_DESC_INTERFACE    (0x00,          /* bInterfaceNumber.                */

+                         0x00,          /* bAlternateSetting.               */

+                         0x01,          /* bNumEndpoints.                   */

+                         0x02,          /* bInterfaceClass (Communications

+                                           Interface Class, CDC section

+                                           4.2).                            */

+                         0x02,          /* bInterfaceSubClass (Abstract

+                                         Control Model, CDC section 4.3).   */

+                         0x01,          /* bInterfaceProtocol (AT commands,

+                                           CDC section 4.4).                */

+                         0),            /* iInterface.                      */

+  /* Header Functional Descriptor (CDC section 5.2.3).*/

+  USB_DESC_BYTE         (5),            /* bLength.                         */

+  USB_DESC_BYTE         (0x24),         /* bDescriptorType (CS_INTERFACE).  */

+  USB_DESC_BYTE         (0x00),         /* bDescriptorSubtype (Header

+                                           Functional Descriptor.           */

+  USB_DESC_BCD          (0x0110),       /* bcdCDC.                          */

+  /* Call Management Functional Descriptor. */

+  USB_DESC_BYTE         (5),            /* bFunctionLength.                 */

+  USB_DESC_BYTE         (0x24),         /* bDescriptorType (CS_INTERFACE).  */

+  USB_DESC_BYTE         (0x01),         /* bDescriptorSubtype (Call Management

+                                           Functional Descriptor).          */

+  USB_DESC_BYTE         (0x00),         /* bmCapabilities (D0+D1).          */

+  USB_DESC_BYTE         (0x01),         /* bDataInterface.                  */

+  /* ACM Functional Descriptor.*/

+  USB_DESC_BYTE         (4),            /* bFunctionLength.                 */

+  USB_DESC_BYTE         (0x24),         /* bDescriptorType (CS_INTERFACE).  */

+  USB_DESC_BYTE         (0x02),         /* bDescriptorSubtype (Abstract

+                                           Control Management Descriptor).  */

+  USB_DESC_BYTE         (0x02),         /* bmCapabilities.                  */

+  /* Union Functional Descriptor.*/

+  USB_DESC_BYTE         (5),            /* bFunctionLength.                 */

+  USB_DESC_BYTE         (0x24),         /* bDescriptorType (CS_INTERFACE).  */

+  USB_DESC_BYTE         (0x06),         /* bDescriptorSubtype (Union

+                                           Functional Descriptor).          */

+  USB_DESC_BYTE         (0x00),         /* bMasterInterface (Communication

+                                           Class Interface).                */

+  USB_DESC_BYTE         (0x01),         /* bSlaveInterface0 (Data Class

+                                           Interface).                      */

+  /* Endpoint 2 Descriptor.*/

+  USB_DESC_ENDPOINT     (USB1_INTERRUPT_REQUEST_EP|0x80,

+                         0x03,          /* bmAttributes (Interrupt).        */

+                         0x0008,        /* wMaxPacketSize.                  */

+                         0xFF),         /* bInterval.                       */

+  /* Interface Descriptor.*/

+  USB_DESC_INTERFACE    (0x01,          /* bInterfaceNumber.                */

+                         0x00,          /* bAlternateSetting.               */

+                         0x02,          /* bNumEndpoints.                   */

+                         0x0A,          /* bInterfaceClass (Data Class

+                                           Interface, CDC section 4.5).     */

+                         0x00,          /* bInterfaceSubClass (CDC section

+                                           4.6).                            */

+                         0x00,          /* bInterfaceProtocol (CDC section

+                                           4.7).                            */

+                         0x00),         /* iInterface.                      */

+  /* Endpoint 3 Descriptor.*/

+  USB_DESC_ENDPOINT     (USB1_DATA_AVAILABLE_EP,       /* bEndpointAddress.*/

+                         0x02,          /* bmAttributes (Bulk).             */

+                         0x0040,        /* wMaxPacketSize.                  */

+                         0x00),         /* bInterval.                       */

+  /* Endpoint 1 Descriptor.*/

+  USB_DESC_ENDPOINT     (USB1_DATA_REQUEST_EP|0x80,    /* bEndpointAddress.*/

+                         0x02,          /* bmAttributes (Bulk).             */

+                         0x0040,        /* wMaxPacketSize.                  */

+                         0x00)          /* bInterval.                       */

+};

+

+/*

+ * Configuration Descriptor wrapper.

+ */

+static const USBDescriptor vcom_configuration_descriptor = {

+  sizeof vcom_configuration_descriptor_data,

+  vcom_configuration_descriptor_data

+};

+

+/*

+ * U.S. English language identifier.

+ */

+static const uint8_t vcom_string0[] = {

+  USB_DESC_BYTE(4),                     /* bLength.                         */

+  USB_DESC_BYTE(USB_DESCRIPTOR_STRING), /* bDescriptorType.                 */

+  USB_DESC_WORD(0x0409)                 /* wLANGID (U.S. English).          */

+};

+

+/*

+ * Vendor string.

+ */

+static const uint8_t vcom_string1[] = {

+  USB_DESC_BYTE(38),                    /* bLength.                         */

+  USB_DESC_BYTE(USB_DESCRIPTOR_STRING), /* bDescriptorType.                 */

+  'S', 0, 'T', 0, 'M', 0, 'i', 0, 'c', 0, 'r', 0, 'o', 0, 'e', 0,

+  'l', 0, 'e', 0, 'c', 0, 't', 0, 'r', 0, 'o', 0, 'n', 0, 'i', 0,

+  'c', 0, 's', 0

+};

+

+/*

+ * Device Description string.

+ */

+static const uint8_t vcom_string2[] = {

+  USB_DESC_BYTE(56),                    /* bLength.                         */

+  USB_DESC_BYTE(USB_DESCRIPTOR_STRING), /* bDescriptorType.                 */

+  'C', 0, 'h', 0, 'i', 0, 'b', 0, 'i', 0, 'O', 0, 'S', 0, '/', 0,

+  'R', 0, 'T', 0, ' ', 0, 'V', 0, 'i', 0, 'r', 0, 't', 0, 'u', 0,

+  'a', 0, 'l', 0, ' ', 0, 'C', 0, 'O', 0, 'M', 0, ' ', 0, 'P', 0,

+  'o', 0, 'r', 0, 't', 0

+};

+

+/*

+ * Serial Number string.

+ */

+static const uint8_t vcom_string3[] = {

+  USB_DESC_BYTE(8),                     /* bLength.                         */

+  USB_DESC_BYTE(USB_DESCRIPTOR_STRING), /* bDescriptorType.                 */

+  '0' + CH_KERNEL_MAJOR, 0,

+  '0' + CH_KERNEL_MINOR, 0,

+  '0' + CH_KERNEL_PATCH, 0

+};

+

+/*

+ * Strings wrappers array.

+ */

+static const USBDescriptor vcom_strings[] = {

+  {sizeof vcom_string0, vcom_string0},

+  {sizeof vcom_string1, vcom_string1},

+  {sizeof vcom_string2, vcom_string2},

+  {sizeof vcom_string3, vcom_string3}

+};

+

+/*

+ * Handles the GET_DESCRIPTOR callback. All required descriptors must be

+ * handled here.

+ */

+static const USBDescriptor *get_descriptor(USBDriver *usbp,

+                                           uint8_t dtype,

+                                           uint8_t dindex,

+                                           uint16_t lang) {

+

+  (void)usbp;

+  (void)lang;

+  switch (dtype) {

+  case USB_DESCRIPTOR_DEVICE:

+    return &vcom_device_descriptor;

+  case USB_DESCRIPTOR_CONFIGURATION:

+    return &vcom_configuration_descriptor;

+  case USB_DESCRIPTOR_STRING:

+    if (dindex < 4)

+      return &vcom_strings[dindex];

+  }

+  return NULL;

+}

+

+/**

+ * @brief   IN EP1 state.

+ */

+static USBInEndpointState ep1instate;

+

+/**

+ * @brief   OUT EP1 state.

+ */

+static USBOutEndpointState ep1outstate;

+

+/**

+ * @brief   EP1 initialization structure (both IN and OUT).

+ */

+static const USBEndpointConfig ep1config = {

+  USB_EP_MODE_TYPE_BULK,

+  NULL,

+  sduDataTransmitted,

+  sduDataReceived,

+  0x0040,

+  0x0040,

+  &ep1instate,

+  &ep1outstate,

+  2,

+  NULL

+};

+

+/**

+ * @brief   IN EP2 state.

+ */

+static USBInEndpointState ep2instate;

+

+/**

+ * @brief   EP2 initialization structure (IN only).

+ */

+static const USBEndpointConfig ep2config = {

+  USB_EP_MODE_TYPE_INTR,

+  NULL,

+  sduInterruptTransmitted,

+  NULL,

+  0x0010,

+  0x0000,

+  &ep2instate,

+  NULL,

+  1,

+  NULL

+};

+

+/*

+ * Handles the USB driver global events.

+ */

+static void usb_event(USBDriver *usbp, usbevent_t event) {

+  extern SerialUSBDriver PORTAB_SDU1;

+

+  switch (event) {

+  case USB_EVENT_ADDRESS:

+    return;

+  case USB_EVENT_CONFIGURED:

+    chSysLockFromISR();

+

+    /* Enables the endpoints specified into the configuration.

+       Note, this callback is invoked from an ISR so I-Class functions

+       must be used.*/

+    usbInitEndpointI(usbp, USB1_DATA_REQUEST_EP, &ep1config);

+    usbInitEndpointI(usbp, USB1_INTERRUPT_REQUEST_EP, &ep2config);

+

+    /* Resetting the state of the CDC subsystem.*/

+    sduConfigureHookI(&PORTAB_SDU1);

+

+    chSysUnlockFromISR();

+    return;

+  case USB_EVENT_RESET:

+    /* Falls into.*/

+  case USB_EVENT_UNCONFIGURED:

+    /* Falls into.*/

+  case USB_EVENT_SUSPEND:

+    chSysLockFromISR();

+

+    /* Disconnection event on suspend.*/

+    sduSuspendHookI(&PORTAB_SDU1);

+

+    chSysUnlockFromISR();

+    return;

+  case USB_EVENT_WAKEUP:

+    chSysLockFromISR();

+

+    /* Disconnection event on suspend.*/

+    sduWakeupHookI(&PORTAB_SDU1);

+

+    chSysUnlockFromISR();

+    return;

+  case USB_EVENT_STALLED:

+    return;

+  }

+  return;

+}

+

+/*

+ * Handles the USB driver global events.

+ */

+static void sof_handler(USBDriver *usbp) {

+

+  (void)usbp;

+

+  osalSysLockFromISR();

+  sduSOFHookI(&PORTAB_SDU1);

+  osalSysUnlockFromISR();

+}

+

+/*

+ * USB driver configuration.

+ */

+const USBConfig usbcfg = {

+  usb_event,

+  get_descriptor,

+  sduRequestsHook,

+  sof_handler

+};

+

+/*

+ * Serial over USB driver configuration.

+ */

+const SerialUSBConfig serusbcfg = {

+  &PORTAB_USB1,

+  USB1_DATA_REQUEST_EP,

+  USB1_DATA_AVAILABLE_EP,

+  USB1_INTERRUPT_REQUEST_EP

+};

diff --git a/demos/STM32/RT-STM32-LWIP-FATFS-USB-HTTPS/usbcfg.h b/demos/STM32/RT-STM32-LWIP-FATFS-USB-HTTPS/usbcfg.h
index 29d09bb83..f0b40ba8f 100644
--- a/demos/STM32/RT-STM32-LWIP-FATFS-USB-HTTPS/usbcfg.h
+++ b/demos/STM32/RT-STM32-LWIP-FATFS-USB-HTTPS/usbcfg.h
@@ -1,26 +1,26 @@
-/*
-    ChibiOS - Copyright (C) 2006..2016 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.
-*/
-
-#ifndef USBCFG_H
-#define USBCFG_H
-
-extern const USBConfig usbcfg;
-extern SerialUSBConfig serusbcfg;
-extern SerialUSBDriver PORTAB_SDU1;
-
-#endif  /* USBCFG_H */
-
-/** @} */
+/*

+    ChibiOS - Copyright (C) 2006..2018 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.

+*/

+

+#ifndef USBCFG_H

+#define USBCFG_H

+

+extern const USBConfig usbcfg;

+extern SerialUSBConfig serusbcfg;

+extern SerialUSBDriver PORTAB_SDU1;

+

+#endif  /* USBCFG_H */

+

+/** @} */

diff --git a/demos/STM32/RT-STM32-LWIP-FATFS-USB-HTTPS/web/web.c b/demos/STM32/RT-STM32-LWIP-FATFS-USB-HTTPS/web/web.c
index 37ce099e7..a8a6385fc 100644
--- a/demos/STM32/RT-STM32-LWIP-FATFS-USB-HTTPS/web/web.c
+++ b/demos/STM32/RT-STM32-LWIP-FATFS-USB-HTTPS/web/web.c
@@ -1,217 +1,217 @@
-/*
-    ChibiOS - Copyright (C) 2006..2016 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 is a modified version of the lwIP web server demo. The original
- * author is unknown because the file didn't contain any license information.
- *
- * The HTTPS version is Copyright (C) 2017 - WolfSSL Inc. and is based on the 
- * demo HTTP code of ChibiOS.
- */
-
-
-/**
- * @file web.c
- * @brief HTTPS server wrapper thread code.
- * @addtogroup WEB_THREAD
- * @{
- */
-
-#include <ctype.h>
-
-#include "ch.h"
-
-#include "lwip/opt.h"
-#include "lwip/arch.h"
-#include "lwip/api.h"
-
-#include "wolfssl_chibios.h"
-#include "web.h"
-
-#if LWIP_NETCONN
-
-static char url_buffer[WEB_MAX_PATH_SIZE];
-extern unsigned char server_cert[];
-extern unsigned int server_cert_len;
-extern unsigned char server_key[];
-extern unsigned int server_key_len;
-
-#define HEXTOI(x) (isdigit(x) ? (x) - '0' : (x) - 'a' + 10)
-
-/**
- * @brief   Decodes an URL sting.
- * @note    The string is terminated by a zero or a separator.
- *
- * @param[in] url       encoded URL string
- * @param[out] buf      buffer for the processed string
- * @param[in] max       max number of chars to copy into the buffer
- * @return              The conversion status.
- * @retval false        string converted.
- * @retval true         the string was not valid or the buffer overflowed
- *
- * @notapi
- */
-static bool decode_url(const char *url, char *buf, size_t max) {
-
-  while (true) {
-    int h, l;
-    unsigned c = *url++;
-
-    switch (c) {
-    case 0:
-    case '\r':
-    case '\n':
-    case '\t':
-    case ' ':
-    case '?':
-      *buf = 0;
-      return false;
-    case '.':
-      if (max <= 1)
-        return true;
-
-      h = *(url + 1);
-      if (h == '.')
-        return true;
-
-      break;
-    case '%':
-      if (max <= 1)
-        return true;
-
-      h = tolower((int)*url++);
-      if (h == 0)
-        return true;
-      if (!isxdigit(h))
-        return true;
-
-      l = tolower((int)*url++);
-      if (l == 0)
-        return true;
-      if (!isxdigit(l))
-        return true;
-
-      c = (char)((HEXTOI(h) << 4) | HEXTOI(l));
-      break;
-    default:
-      if (max <= 1)
-        return true;
-
-      if (!isalnum(c) && (c != '_') && (c != '-') && (c != '+') &&
-          (c != '/'))
-        return true;
-
-      break;
-    }
-
-    *buf++ = c;
-    max--;
-  }
-}
-
-
-#define MAX_HTTPREQ_SIZE 256
-static const char http_html_hdr[] = "HTTP/1.1 200 OK\r\nContent-type: text/html\r\n\r\n";
-static const char http_index_html[] = "<html><head><title>Congrats!</title></head><body><h1>Welcome to chibiOS HTTPS server!</h1><p>Powered by LwIP + WolfSSL</body></html>";
-
-static char inbuf[MAX_HTTPREQ_SIZE];
-static void https_server_serve(sslconn *sc) 
-{
-  int ret;
-
-  /* Read the data from the port, blocking if nothing yet there.
-     We assume the request (the part we care about) is in one netbuf.*/
-  ret = wolfSSL_read(sc->ssl, inbuf, MAX_HTTPREQ_SIZE);
-  if (ret >= 5 &&
-          inbuf[0] == 'G' &&
-          inbuf[1] == 'E' &&
-          inbuf[2] == 'T' &&
-          inbuf[3] == ' ' &&
-          inbuf[4] == '/') {
-
-      if (decode_url(inbuf + 4, url_buffer, WEB_MAX_PATH_SIZE)) {
-          /* Invalid URL handling.*/
-          return;
-      }
-
-      /* Send the HTML header
-       * subtract 1 from the size, since we dont send the \0 in the string
-       * NETCONN_NOCOPY: our data is const static, so no need to copy it
-       */
-      wolfSSL_write(sc->ssl, http_html_hdr, sizeof(http_html_hdr)-1);
-
-      /* Send our HTML page */
-      wolfSSL_write(sc->ssl, http_index_html, sizeof(http_index_html)-1);
-  }
-}
-
-/**
- * @brief   Stack area for the http thread.
- */
-THD_WORKING_AREA(wa_https_server, WEB_THREAD_STACK_SIZE);
-
-/**
- * @brssl   HTTPS server thread.
- */
-THD_FUNCTION(https_server, p) {
-  sslconn *sc, *newsc;
-  (void)p;
-  chRegSetThreadName("https");
-
-  /* Initialize wolfSSL */
-  wolfSSL_Init();
-
-  /* Create a new SSL connection handle */
-  sc = sslconn_new(NETCONN_TCP, wolfTLSv1_2_server_method());
-  if (!sc) {
-      while(1) {}
-  }
-
-  /* Load certificate file for the HTTPS server */
-  if (wolfSSL_CTX_use_certificate_buffer(sc->ctx, server_cert,
-              server_cert_len, SSL_FILETYPE_ASN1 ) != SSL_SUCCESS)
-      while(1) {}
-
-  /* Load the private key */
-  if (wolfSSL_CTX_use_PrivateKey_buffer(sc->ctx, server_key, 
-              server_key_len, SSL_FILETYPE_ASN1 ) != SSL_SUCCESS)
-      while(1) {}
-  
-  /* Bind to port 443 (HTTPS) with default IP address */
-  netconn_bind(sc->conn, NULL, WEB_THREAD_PORT);
-
-  /* Put the connection into LISTEN state */
-  netconn_listen(sc->conn);
-  
-  /* Goes to the final priority after initialization.*/
-  chThdSetPriority(WEB_THREAD_PRIORITY);
-
-  /* Listening loop */
-  while (true) {
-    newsc = sslconn_accept(sc);
-    if (!newsc) {
-        chThdSleepMilliseconds(500);
-        continue;
-    }
-    /* New connection: a new SSL connector is spawned */
-    https_server_serve(newsc);
-    sslconn_close(newsc);
-  }
-}
-
-#endif /* LWIP_NETCONN */
-
-/** @} */
+/*

+    ChibiOS - Copyright (C) 2006..2018 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 is a modified version of the lwIP web server demo. The original

+ * author is unknown because the file didn't contain any license information.

+ *

+ * The HTTPS version is Copyright (C) 2017 - WolfSSL Inc. and is based on the 

+ * demo HTTP code of ChibiOS.

+ */

+

+

+/**

+ * @file web.c

+ * @brief HTTPS server wrapper thread code.

+ * @addtogroup WEB_THREAD

+ * @{

+ */

+

+#include <ctype.h>

+

+#include "ch.h"

+

+#include "lwip/opt.h"

+#include "lwip/arch.h"

+#include "lwip/api.h"

+

+#include "wolfssl_chibios.h"

+#include "web.h"

+

+#if LWIP_NETCONN

+

+static char url_buffer[WEB_MAX_PATH_SIZE];

+extern unsigned char server_cert[];

+extern unsigned int server_cert_len;

+extern unsigned char server_key[];

+extern unsigned int server_key_len;

+

+#define HEXTOI(x) (isdigit(x) ? (x) - '0' : (x) - 'a' + 10)

+

+/**

+ * @brief   Decodes an URL sting.

+ * @note    The string is terminated by a zero or a separator.

+ *

+ * @param[in] url       encoded URL string

+ * @param[out] buf      buffer for the processed string

+ * @param[in] max       max number of chars to copy into the buffer

+ * @return              The conversion status.

+ * @retval false        string converted.

+ * @retval true         the string was not valid or the buffer overflowed

+ *

+ * @notapi

+ */

+static bool decode_url(const char *url, char *buf, size_t max) {

+

+  while (true) {

+    int h, l;

+    unsigned c = *url++;

+

+    switch (c) {

+    case 0:

+    case '\r':

+    case '\n':

+    case '\t':

+    case ' ':

+    case '?':

+      *buf = 0;

+      return false;

+    case '.':

+      if (max <= 1)

+        return true;

+

+      h = *(url + 1);

+      if (h == '.')

+        return true;

+

+      break;

+    case '%':

+      if (max <= 1)

+        return true;

+

+      h = tolower((int)*url++);

+      if (h == 0)

+        return true;

+      if (!isxdigit(h))

+        return true;

+

+      l = tolower((int)*url++);

+      if (l == 0)

+        return true;

+      if (!isxdigit(l))

+        return true;

+

+      c = (char)((HEXTOI(h) << 4) | HEXTOI(l));

+      break;

+    default:

+      if (max <= 1)

+        return true;

+

+      if (!isalnum(c) && (c != '_') && (c != '-') && (c != '+') &&

+          (c != '/'))

+        return true;

+

+      break;

+    }

+

+    *buf++ = c;

+    max--;

+  }

+}

+

+

+#define MAX_HTTPREQ_SIZE 256

+static const char http_html_hdr[] = "HTTP/1.1 200 OK\r\nContent-type: text/html\r\n\r\n";

+static const char http_index_html[] = "<html><head><title>Congrats!</title></head><body><h1>Welcome to chibiOS HTTPS server!</h1><p>Powered by LwIP + WolfSSL</body></html>";

+

+static char inbuf[MAX_HTTPREQ_SIZE];

+static void https_server_serve(sslconn *sc) 

+{

+  int ret;

+

+  /* Read the data from the port, blocking if nothing yet there.

+     We assume the request (the part we care about) is in one netbuf.*/

+  ret = wolfSSL_read(sc->ssl, inbuf, MAX_HTTPREQ_SIZE);

+  if (ret >= 5 &&

+          inbuf[0] == 'G' &&

+          inbuf[1] == 'E' &&

+          inbuf[2] == 'T' &&

+          inbuf[3] == ' ' &&

+          inbuf[4] == '/') {

+

+      if (decode_url(inbuf + 4, url_buffer, WEB_MAX_PATH_SIZE)) {

+          /* Invalid URL handling.*/

+          return;

+      }

+

+      /* Send the HTML header

+       * subtract 1 from the size, since we dont send the \0 in the string

+       * NETCONN_NOCOPY: our data is const static, so no need to copy it

+       */

+      wolfSSL_write(sc->ssl, http_html_hdr, sizeof(http_html_hdr)-1);

+

+      /* Send our HTML page */

+      wolfSSL_write(sc->ssl, http_index_html, sizeof(http_index_html)-1);

+  }

+}

+

+/**

+ * @brief   Stack area for the http thread.

+ */

+THD_WORKING_AREA(wa_https_server, WEB_THREAD_STACK_SIZE);

+

+/**

+ * @brssl   HTTPS server thread.

+ */

+THD_FUNCTION(https_server, p) {

+  sslconn *sc, *newsc;

+  (void)p;

+  chRegSetThreadName("https");

+

+  /* Initialize wolfSSL */

+  wolfSSL_Init();

+

+  /* Create a new SSL connection handle */

+  sc = sslconn_new(NETCONN_TCP, wolfTLSv1_2_server_method());

+  if (!sc) {

+      while(1) {}

+  }

+

+  /* Load certificate file for the HTTPS server */

+  if (wolfSSL_CTX_use_certificate_buffer(sc->ctx, server_cert,

+              server_cert_len, SSL_FILETYPE_ASN1 ) != SSL_SUCCESS)

+      while(1) {}

+

+  /* Load the private key */

+  if (wolfSSL_CTX_use_PrivateKey_buffer(sc->ctx, server_key, 

+              server_key_len, SSL_FILETYPE_ASN1 ) != SSL_SUCCESS)

+      while(1) {}

+  

+  /* Bind to port 443 (HTTPS) with default IP address */

+  netconn_bind(sc->conn, NULL, WEB_THREAD_PORT);

+

+  /* Put the connection into LISTEN state */

+  netconn_listen(sc->conn);

+  

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

+  chThdSetPriority(WEB_THREAD_PRIORITY);

+

+  /* Listening loop */

+  while (true) {

+    newsc = sslconn_accept(sc);

+    if (!newsc) {

+        chThdSleepMilliseconds(500);

+        continue;

+    }

+    /* New connection: a new SSL connector is spawned */

+    https_server_serve(newsc);

+    sslconn_close(newsc);

+  }

+}

+

+#endif /* LWIP_NETCONN */

+

+/** @} */

diff --git a/demos/STM32/RT-STM32-LWIP-FATFS-USB-HTTPS/web/web.h b/demos/STM32/RT-STM32-LWIP-FATFS-USB-HTTPS/web/web.h
index 0c5e2ab99..e43139d11 100644
--- a/demos/STM32/RT-STM32-LWIP-FATFS-USB-HTTPS/web/web.h
+++ b/demos/STM32/RT-STM32-LWIP-FATFS-USB-HTTPS/web/web.h
@@ -1,55 +1,55 @@
-/*
-    ChibiOS - Copyright (C) 2006..2016 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 web.h
- * @brief HTTP server wrapper thread macros and structures.
- * @addtogroup WEB_THREAD
- * @{
- */
-
-#ifndef WEB_H
-#define WEB_H
-
-#if !defined(WEB_THREAD_STACK_SIZE)
-#define WEB_THREAD_STACK_SIZE           (16 * 1024)
-#endif
-
-#if !defined(WEB_THREAD_PORT)
-#define WEB_THREAD_PORT                 443
-#endif
-
-#if !defined(WEB_THREAD_PRIORITY)
-#define WEB_THREAD_PRIORITY             (LOWPRIO + 2)
-#endif
-
-#if !defined(WEB_MAX_PATH_SIZE)
-#define WEB_MAX_PATH_SIZE               128
-#endif
-
-extern THD_WORKING_AREA(wa_https_server, WEB_THREAD_STACK_SIZE);
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-  THD_FUNCTION(https_server, p);
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* WEB_H */
-
-/** @} */
+/*

+    ChibiOS - Copyright (C) 2006..2018 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 web.h

+ * @brief HTTP server wrapper thread macros and structures.

+ * @addtogroup WEB_THREAD

+ * @{

+ */

+

+#ifndef WEB_H

+#define WEB_H

+

+#if !defined(WEB_THREAD_STACK_SIZE)

+#define WEB_THREAD_STACK_SIZE           (16 * 1024)

+#endif

+

+#if !defined(WEB_THREAD_PORT)

+#define WEB_THREAD_PORT                 443

+#endif

+

+#if !defined(WEB_THREAD_PRIORITY)

+#define WEB_THREAD_PRIORITY             (LOWPRIO + 2)

+#endif

+

+#if !defined(WEB_MAX_PATH_SIZE)

+#define WEB_MAX_PATH_SIZE               128

+#endif

+

+extern THD_WORKING_AREA(wa_https_server, WEB_THREAD_STACK_SIZE);

+

+#ifdef __cplusplus

+extern "C" {

+#endif

+  THD_FUNCTION(https_server, p);

+#ifdef __cplusplus

+}

+#endif

+

+#endif /* WEB_H */

+

+/** @} */