Merge remote-tracking branch 'refs/remotes/mbedmicro/master' into dev_xxxx_xxx

Author: dbestm

README.md

@@ -68,6 +68,7 @@ STMicroelectronics:
 * [Nucleo-F334R8](https://developer.mbed.org/platforms/ST-Nucleo-F334R8/) (Cortex-M4F)
 * [Nucleo-F401RE](https://developer.mbed.org/platforms/ST-Nucleo-F401RE/) (Cortex-M4F)
 * [Nucleo-F411RE](https://developer.mbed.org/platforms/ST-Nucleo-F411RE/) (Cortex-M4F)
+* [Nucleo-L476RG](https://developer.mbed.org/platforms/ST-Nucleo-L476RG/) (Cortex-M4F)
 * STM32F4XX (Cortex-M4F)
 * STM32F3XX (Cortex-M4F)
 * STM32F0-Discovery (Cortex-M0)
@@ -76,6 +77,7 @@ STMicroelectronics:
 * STM32F4-Discovery (Cortex-M4F)
 * STM32F429-Discovery (Cortex-M4F)
 * STM32L0-Discovery (Cortex-M0+)
+* [STM32L4-Discovery](https://developer.mbed.org/platforms/ST-Discovery-L476VG/) (Cortex-M4F)
 * [Arch Max](https://developer.mbed.org/platforms/Seeed-Arch-Max/) (Cortex-M4F)
 
 

docs/BUILDING.md

@@ -135,11 +135,11 @@ LICENSE  MANIFEST.in  README.md  libraries  setup.py  travis  workspace_tools
 ```
 Directory structure we are interested in:
 ```
-  mbed/workspace_tools/         - test suite scripts, build scripts etc.
-  mbed/library/tests/           - mbed SDK tests,
-  mbed/library/tests/mbed/      - tests for mbed SDK and peripherals tests,
-  mbed/library/tests/net/echo/  - tests for Ethernet interface,
-  mbed/library/tests/rtos/mbed/ - tests for RTOS. 
+  mbed/workspace_tools/           - test suite scripts, build scripts etc.
+  mbed/libraries/tests/           - mbed SDK tests,
+  mbed/libraries/tests/mbed/      - tests for mbed SDK and peripherals tests,
+  mbed/libraries/tests/net/echo/  - tests for Ethernet interface,
+  mbed/libraries/tests/rtos/mbed/ - tests for RTOS. 
 ```
 
 ### Workspace tools
@@ -334,7 +334,7 @@ Build successes:
 
 * If you’re unsure which platforms and toolchains are supported please use switch ```-S``` to print simple matrix of platform to compiler dependencies.
 ```
-$ python python build.py -S
+$ python build.py -S
 +-------------------------+-----------+-----------+-----------+-----------+-----------+-----------+------------+---------------+
 | Platform                |    ARM    |    uARM   |  GCC_ARM  |    IAR    |   GCC_CR  |   GCC_CS  | GCC_CW_EWL | GCC_CW_NEWLIB |
 +-------------------------+-----------+-----------+-----------+-----------+-----------+-----------+------------+---------------+

docs/COMMITTERS.md

@@ -1,6 +1,6 @@
 # Committing changes to mbedmicro/mbed
 * Our current branching model is very simple. We are using ```master``` branch to merge all pull requests.
-* Based on stable ```SHA``` version of ```master``` branch we decide to release and att he same time ```tag``` our build release.
+* Based on stable ```SHA``` version of ```master``` branch we decide to release and at the same time ```tag``` our build release.
 * Our current release versioning follows simple integer version: ```94```, ```95```, ```96``` etc.
 
 # Committer Guide

docs/TESTING.md

@@ -8,7 +8,7 @@ Each test is supervised by python script called “host test” which will at le
 ## What is host test?
 Test suite supports test supervisor concept. This concept is realized by separate Python script called ```host test```. Host tests can be found in ```mbed/workspace_tools/host_tests/``` directory. Note: In newer mbed versions (mbed OS) host tests will be separate library.
 
-Host test script is executed in parallel with test runner to monitor test execution. Basic host test just monitors device's default serial port for test results returned by test runner. Simple tests will print test result on serial port. In other cases host tests can for example judge by test results returned by test runner is test passed or failed. It all depends on test itself.
+Host test script is executed in parallel with test runner to monitor test execution. Basic host test just monitors device's default serial port for test results returned by test runner. Simple tests will print test result on serial port. In other cases host tests can for example judge by test results returned by test runner if test passed or failed. It all depends on test itself.
 
 In some cases host test can be TCP server echoing packets from test runner and judging packet loss. In other cases it can just check if values returned from accelerometer are actually valid (sane).
 
@@ -37,7 +37,7 @@ After connecting boards to our host machine (PC) we can check which serial ports
 * ```NUCLEO_F103RB``` serial port is on ```COM11``` and disk drive is ```I:```. 
 If you are working under Linux your port and disk could look like /dev/ttyACM5 and /media/usb5.
 
-This information is needed to create ```muts_all.json``` configuration file. You can create in in ```mbed/workspace_tools/``` directory:
+This information is needed to create ```muts_all.json``` configuration file. You can create it in ```mbed/workspace_tools/``` directory:
 ```
 $ touch muts_all.json
 ```
@@ -289,13 +289,13 @@ $ python singletest.py -R -f RTOS
 ```
 
 * Shuffle your tests. We strongly encourage you to shuffle your test order each time you execute test suite script.
-Rationale: It is probable that tests executed in one particular order will pass and in other will fail. To shuffle your tests’ order please use option ```–u``` (or ```--shuffle```):
+Rationale: It is probable that tests executed in one particular order will pass and in other will fail. To shuffle your tests’ order please use option ```-u``` (or ```--shuffle```):
 ```
 $ python singletest.py -i test_spec.json -M muts_all.json --shuffle
 ```
-Above command with force test script to randomly generate shuffle seed and shuffle test order execution. Note: Shuffle seed is float in ```[0.0, 1.0)```.
+Above command will force test script to randomly generate shuffle seed and shuffle test order execution. Note: Shuffle seed is float in ```[0.0, 1.0)```.
 
-You can always recreate particular test order by forcing shuffle (```-u``` or ```--shuffle```} switch) and passing shuffle seed back to test suite using ```--shuffle-seed``` switch:
+You can always recreate particular test order by forcing shuffle (```-u``` or ```--shuffle``` switch) and passing shuffle seed back to test suite using ```--shuffle-seed``` switch:
 ```
 $ python singletest.py -i test_spec.json -M muts_all.json --shuffle --shuffle-seed 0.4041028336
 ```
@@ -311,7 +311,7 @@ Shuffle Seed: 0.4041028336
 Completed in 234.85 sec
 ```
 
-### Exmple of device configuration (one device connected to host computer)
+### Example of device configuration (one device connected to host computer)
 
 This example will show you how to configure single device, run general tests or only peripheral tests. We will also show some real test result examples.
 
@@ -597,7 +597,7 @@ Note: In dependency section we've added library ```CPPUTEST_LIBRARY``` which is
 
 ### Tests are now divided into two types:
 #### 'Hello world' tests 
-First type of test cases we call 'hello world' tests. They do not dependent on CppUTest library and are monolithic programs usually composed of one main function. Yo can find this tests in below example directories:
+First type of test cases we call 'hello world' tests. They do not dependent on CppUTest library and are monolithic programs usually composed of one main function. You can find this tests in below example directories:
 
 * ```mbed/libraries/tests/mbed/```
 * ```mbed/libraries/tests/net/```
@@ -767,12 +767,12 @@ TEST(BusOut_digitalout_write, led_1_nc_2_nc_nc_3)
 ```
 
 ## Example
-In below example we will run two example unit tests that are now available. tests ```UT_1``` and ```UT_2``` are unit tests used for now only to check if mbed SDK works with CppUTest library and if tests are being executed. In future number of unit tests will increase, nothing is also should stop you from writing and executing your own unit tests!
+In below example we will run two example unit tests that are now available. tests ```UT_1``` and ```UT_2``` are unit tests used for now only to check if mbed SDK works with CppUTest library and if tests are being executed. In future number of unit tests will increase, nothing is also stopping you from writing and executing your own unit tests!
 
 ### Example configuration
 By default unit tests ```UT_1``` and ```UT_2``` are not automated - simply test suite will ignore them. Also we do not want to create dependency to CppUTest library each time someone executes automation.
 
-Note: To compile ```UT_1``` and ```UT_2``` tests CppUTest library described above installation is needed and not all users wish to add UT libs to their project. Also new to mbed users may find it difficult. This is why unit testing is an extra feature active only after you deliberately install and enable needed components.
+Note: To compile ```UT_1``` and ```UT_2``` tests CppUTest library described above, installation is needed and not all users wish to add UT libs to their project. Also new to mbed users may find it difficult. This is why unit testing is an extra feature active only after you deliberately install and enable needed components.
 
 Bellow snippet shows how to modify 'automated' flag so test suite will consider unit tests ```UT_1``` and ```UT_2``` as part of "automated test portfolio". Just change flag 'automated' from ```False``` to ```True```.
 

libraries/USBHost/USBHost/TARGET_RENESAS/TARGET_RZ_A1H/ohci_wrapp_RZ_A1.c

@@ -199,7 +199,6 @@ static int32_t iso_trans_doing(hced_t *p_ed, uint32_t index);
 static void chk_iso_td_done(genelal_ed_t *p_g_ed);
 static int32_t chk_iso_ed(genelal_ed_t *p_g_ed);
 static void iso_trans_setting(genelal_ed_t *p_g_ed, uint32_t index);
-static uint32_t iso_chk_starting_frame(genelal_ed_t *p_g_ed);
 static void iso_trans(genelal_ed_t *p_g_ed);
 #endif
 static void connect_check(void);
@@ -215,6 +214,7 @@ static usb_ohci_reg_t *p_usb_reg     = &usb_reg;
 static usbisr_fnc_t   *p_usbisr_cb   = NULL;
 static osSemaphoreId  semid_cb       = NULL;
 static uint32_t       connect_change = 0xFFFFFFFF;
+static uint32_t       connect_status = 0;
 static uint32_t       init_end       = 0;
 static genelal_ed_t   ctl_ed;
 static genelal_ed_t   blk_ed;
@@ -283,13 +283,13 @@ osThreadDef(int_ed_task_4,   osPriorityNormal,      512);
 static void iso_ed_task_1(void const * argument) {
     iso_ed_task(argument);
 }
-osThreadDef(iso_ed_task_1,   osPriorityNormal,      512);
+osThreadDef(iso_ed_task_1,   osPriorityAboveNormal, 512);
 #endif
 #if (ISO_TRANS_MAX_NUM >= 2)
 static void iso_ed_task_2(void const * argument) {
     iso_ed_task(argument);
 }
-osThreadDef(iso_ed_task_2,   osPriorityNormal,      512);
+osThreadDef(iso_ed_task_2,   osPriorityAboveNormal, 512);
 #endif
 
 void ohciwrapp_init(usbisr_fnc_t *p_usbisr_fnc) {
@@ -878,25 +878,28 @@ static void control_trans(genelal_ed_t *p_g_ed) {
     p_g_ed->pipe_no    = USB_HOST_PIPE0;
 
     p_g_ed->trans_wait = 1;
-
-    if (td_info.direction == 0) {
-        uint16_t Req  = (p_td->currBufPtr[1] << 8) + p_td->currBufPtr[0];
-        uint16_t Val  = (p_td->currBufPtr[3] << 8) + p_td->currBufPtr[2];
-        uint16_t Indx = (p_td->currBufPtr[5] << 8) + p_td->currBufPtr[4];
-        uint16_t Len  = (p_td->currBufPtr[7] << 8) + p_td->currBufPtr[6];
-
-        g_usbx_host_data_pointer[USB_HOST_PIPE0] = p_td->bufEnd;
-        usbx_host_SetupStage(Req, Val, Indx, Len);
-    } else if (td_info.direction == 1) {
-        usbx_host_CtrlWriteStart(td_info.count, p_td->currBufPtr);
+    if (connect_status == 0) {
+        ohciwrapp_loc_TransEnd(p_g_ed->pipe_no, TD_CC_DEVICENOTRESPONDING);
     } else {
-        usbx_host_CtrlReadStart(td_info.count, p_td->currBufPtr);
-    }
+        if (td_info.direction == 0) {
+            uint16_t Req  = (p_td->currBufPtr[1] << 8) + p_td->currBufPtr[0];
+            uint16_t Val  = (p_td->currBufPtr[3] << 8) + p_td->currBufPtr[2];
+            uint16_t Indx = (p_td->currBufPtr[5] << 8) + p_td->currBufPtr[4];
+            uint16_t Len  = (p_td->currBufPtr[7] << 8) + p_td->currBufPtr[6];
+
+            g_usbx_host_data_pointer[USB_HOST_PIPE0] = p_td->bufEnd;
+            usbx_host_SetupStage(Req, Val, Indx, Len);
+        } else if (td_info.direction == 1) {
+            usbx_host_CtrlWriteStart(td_info.count, p_td->currBufPtr);
+        } else {
+            usbx_host_CtrlReadStart(td_info.count, p_td->currBufPtr);
+        }
 
-    (void)osSemaphoreWait(p_g_ed->semid_wait, CTL_TRANS_TIMEOUT);
-    if (p_g_ed->trans_wait == 1) {
-        p_g_ed->trans_wait = 0;
-        RZA_IO_RegWrite_32(&p_td->control, TD_CC_DEVICENOTRESPONDING, TD_CTL_SHFT_CC, TD_CTL_MSK_CC);
+        (void)osSemaphoreWait(p_g_ed->semid_wait, CTL_TRANS_TIMEOUT);
+        if (p_g_ed->trans_wait == 1) {
+            p_g_ed->trans_wait = 0;
+            RZA_IO_RegWrite_32(&p_td->control, TD_CC_DEVICENOTRESPONDING, TD_CTL_SHFT_CC, TD_CTL_MSK_CC);
+        }
     }
 
     g_usbx_host_CmdStage &= (~USB_HOST_CMD_FIELD);
@@ -928,14 +931,18 @@ static void bulk_trans(genelal_ed_t *p_g_ed) {
     set_togle(p_g_ed->pipe_no, p_td, p_ed);
 
     p_g_ed->trans_wait = 1;
-    if (td_info.direction == 1) {
-        usbx_host_start_send_transfer(p_g_ed->pipe_no, td_info.count, p_td->currBufPtr);
+    if (connect_status == 0) {
+        ohciwrapp_loc_TransEnd(p_g_ed->pipe_no, TD_CC_DEVICENOTRESPONDING);
     } else {
-        usbx_host_start_receive_transfer(p_g_ed->pipe_no, td_info.count, p_td->currBufPtr);
-    }
+        if (td_info.direction == 1) {
+            usbx_host_start_send_transfer(p_g_ed->pipe_no, td_info.count, p_td->currBufPtr);
+        } else {
+            usbx_host_start_receive_transfer(p_g_ed->pipe_no, td_info.count, p_td->currBufPtr);
+        }
 
-    (void)osSemaphoreWait(p_g_ed->semid_wait, BLK_TRANS_TIMEOUT);
-    usbx_host_stop_transfer(p_g_ed->pipe_no);
+        (void)osSemaphoreWait(p_g_ed->semid_wait, BLK_TRANS_TIMEOUT);
+        usbx_host_stop_transfer(p_g_ed->pipe_no);
+    }
 }
 
 static void int_trans_setting(genelal_ed_t *p_g_ed, uint32_t index) {
@@ -1023,10 +1030,14 @@ static void int_trans(genelal_ed_t *p_g_ed) {
 
     get_td_info(p_g_ed, &td_info);
     p_g_ed->trans_wait = 1;
-    if (td_info.direction == 1) {
-        usbx_host_start_send_transfer(p_g_ed->pipe_no, td_info.count, p_td->currBufPtr);
+    if (connect_status == 0) {
+        ohciwrapp_loc_TransEnd(p_g_ed->pipe_no, TD_CC_DEVICENOTRESPONDING);
     } else {
-        usbx_host_start_receive_transfer(p_g_ed->pipe_no, td_info.count, p_td->currBufPtr);
+        if (td_info.direction == 1) {
+            usbx_host_start_send_transfer(p_g_ed->pipe_no, td_info.count, p_td->currBufPtr);
+        } else {
+            usbx_host_start_receive_transfer(p_g_ed->pipe_no, td_info.count, p_td->currBufPtr);
+        }
     }
 }
 
@@ -1089,7 +1100,6 @@ static void set_togle(uint32_t pipe, hctd_t *p_td, hced_t *p_ed) {
 static void iso_ed_task(void const * argument) {
     genelal_ed_t *p_iso_ed = &iso_ed[(uint32_t)argument];
     uint32_t     wait_cnt = 0;
-    uint32_t     wait_time = 0;
     hcca_t       *p_hcca;
     hced_t       *p_ed;
 
@@ -1115,17 +1125,26 @@ static void iso_ed_task(void const * argument) {
         if (p_iso_ed->p_curr_ed != NULL) {
             while ((p_usb_reg->HcControl & OR_CONTROL_IE) != 0) {
                 if (chk_iso_ed(p_iso_ed) != 0) {
-                    wait_time = iso_chk_starting_frame(p_iso_ed);
-                    if (wait_time != 0) {
-                        osDelay(wait_time);
-                        p_usb_reg->HcFmNumber += wait_time;
-                        p_usb_reg->HcFmNumber &= 0x0000FFFF;
+                    hcisotd_t *p_isotd = (hcisotd_t *)p_iso_ed->p_curr_td;
+                    uint32_t  starting_frame = p_isotd->control & 0x0000FFFF;
+                    uint32_t  wait_time = 0;
+                    uint32_t  wk_HcFmNumber = p_usb_reg->HcFmNumber;
+
+                    if (starting_frame > wk_HcFmNumber) {
+                        wait_time = starting_frame - wk_HcFmNumber;
+                    } else {
+                        wait_time = (0xFFFF - wk_HcFmNumber) + starting_frame;
+                    }
+                    if ((wait_time >= 2) && (wait_time <= 1000)) {
+                        for (int cnt = 0; cnt < (wait_time - 1); cnt++) {
+                            osDelay(1);
+                            p_usb_reg->HcFmNumber = (wk_HcFmNumber + cnt) & 0x0000FFFF;
+                        }
                     }
                     p_iso_ed->psw_idx   = 0;
                     iso_trans(p_iso_ed);
                     (void)osSemaphoreWait(p_iso_ed->semid_wait, osWaitForever);
-                    usbx_host_stop_transfer(p_iso_ed->pipe_no);
-                    wait_cnt = 1;
+                    wait_cnt = 8;
                 } else {
                     if (wait_cnt > 0) {
                         wait_cnt--;
@@ -1234,18 +1253,6 @@ static void iso_trans_setting(genelal_ed_t *p_g_ed, uint32_t index) {
     usbx_api_host_SetEndpointTable(td_info.devadr, user_table, wk_table);
 }
 
-static uint32_t iso_chk_starting_frame(genelal_ed_t *p_g_ed) {
-    hcisotd_t *p_isotd = (hcisotd_t *)p_g_ed->p_curr_td;
-    uint32_t  starting_frame = p_isotd->control & 0x0000FFFF;
-    uint32_t  wait_time = 0;
-
-    if ((p_g_ed->psw_idx == 0) && (starting_frame > p_usb_reg->HcFmNumber)) {
-        wait_time = starting_frame - p_usb_reg->HcFmNumber;
-    }
-
-    return wait_time;
-}
-
 static void iso_trans(genelal_ed_t *p_g_ed) {
     hcisotd_t *p_isotd = (hcisotd_t *)p_g_ed->p_curr_td;
     tdinfo_t  td_info;
@@ -1268,10 +1275,14 @@ static void iso_trans(genelal_ed_t *p_g_ed) {
 
     get_td_info(p_g_ed, &td_info);
     p_g_ed->trans_wait = 1;
-    if (td_info.direction == 1) {
-        usbx_host_start_send_transfer(p_g_ed->pipe_no, data_size, (uint8_t *)buff_addr);
+    if (connect_status == 0) {
+        ohciwrapp_loc_TransEnd(p_g_ed->pipe_no, TD_CC_DEVICENOTRESPONDING);
     } else {
-        usbx_host_start_receive_transfer(p_g_ed->pipe_no, data_size, (uint8_t *)buff_addr);
+        if (td_info.direction == 1) {
+            usbx_host_start_send_transfer(p_g_ed->pipe_no, data_size, (uint8_t *)buff_addr);
+        } else {
+            usbx_host_start_receive_transfer(p_g_ed->pipe_no, data_size, (uint8_t *)buff_addr);
+        }
     }
 }
 #endif
@@ -1326,6 +1337,7 @@ static void connect_check(void) {
 void ohciwrapp_loc_Connect(uint32_t type) {
     uint32_t cnt;
 
+    connect_status = type;
     connect_change = type;
     if (type == 0) {
         if (ctl_ed.trans_wait == 1) {
@@ -1445,11 +1457,7 @@ void ohciwrapp_loc_TransEnd(uint32_t pipe, uint32_t ConditionCode) {
 
         if (p_isotd != NULL) {
             usbx_host_stop_transfer(pipe);
-            if (p_usb_reg->HcFmNumber < 0x0000FFFF) {
-                p_usb_reg->HcFmNumber++;
-            } else {
-                p_usb_reg->HcFmNumber = 0;
-            }
+            p_usb_reg->HcFmNumber = ((p_isotd->control & 0x0000FFFF) + p_wait_ed->psw_idx) & 0x0000FFFF;
 
             /* Size of packet */
             p_isotd->offsetPSW[p_wait_ed->psw_idx] -= g_usbx_host_data_count[pipe];
@@ -1469,10 +1477,8 @@ void ohciwrapp_loc_TransEnd(uint32_t pipe, uint32_t ConditionCode) {
                 p_wait_ed->psw_idx++;
             }
             if (chk_iso_ed(p_wait_ed) != 0) {
-                if (iso_chk_starting_frame(p_wait_ed) == 0) {
-                    iso_trans(p_wait_ed);
-                    next_trans = 1;
-                }
+                iso_trans(p_wait_ed);
+                next_trans = 1;
             }
             if (next_trans == 0) {
                 p_wait_ed->trans_wait = 0;