Merge remote-tracking branch 'upstream/master' into feature_multi_emac

Author: bulislaw

features/unsupported/USBDevice/USBAudio/USBAudio.cpp

@@ -113,9 +113,13 @@ bool USBAudio::write(uint8_t * buf) {
     return true;
 }
 
-void USBAudio::writeSync(uint8_t *buf)
+void USBAudio::writeSync(uint8_t *buf, AudioSampleCorrectType jitter_nb)
 {
-    USBDevice::writeNB(EPISO_IN, buf, PACKET_SIZE_ISO_OUT, PACKET_SIZE_ISO_OUT);
+    if ((jitter_nb != RemoveOneSample) && (jitter_nb != AddOneSample)) {
+        jitter_nb = NoCorrection;
+    }
+    /* each sample is 2 bytes */
+    USBDevice::writeNB(EPISO_IN, buf, PACKET_SIZE_ISO_OUT + jitter_nb *(this->channel_nb_out*2), PACKET_SIZE_ISO_OUT+this->channel_nb_out*2);
 }
 
 uint32_t USBAudio::readSync(uint8_t *buf)
@@ -195,7 +199,7 @@ bool USBAudio::USBCallback_setConfiguration(uint8_t configuration) {
 
     // Configure isochronous endpoint
     realiseEndpoint(EPISO_OUT, PACKET_SIZE_ISO_IN, ISOCHRONOUS);
-    realiseEndpoint(EPISO_IN, PACKET_SIZE_ISO_OUT, ISOCHRONOUS);
+    realiseEndpoint(EPISO_IN, PACKET_SIZE_ISO_OUT+this->channel_nb_out*2, ISOCHRONOUS);
 
     // activate readings on this endpoint
     readStart(EPISO_OUT, PACKET_SIZE_ISO_IN);
@@ -597,8 +601,8 @@ uint8_t * USBAudio::configurationDesc() {
         ENDPOINT_DESCRIPTOR,                    // bDescriptorType
         PHY_TO_DESC(EPISO_IN),                  // bEndpointAddress
         E_ISOCHRONOUS,                          // bmAttributes
-        (uint8_t)(LSB(PACKET_SIZE_ISO_OUT)),                   // wMaxPacketSize
-        (uint8_t)(MSB(PACKET_SIZE_ISO_OUT)),                   // wMaxPacketSize
+        (uint8_t)(LSB(PACKET_SIZE_ISO_OUT+channel_nb_out*2)),                   // wMaxPacketSize
+        (uint8_t)(MSB(PACKET_SIZE_ISO_OUT+channel_nb_out*2)),                   // wMaxPacketSize
         0x01,                                   // bInterval
         0x00,                                   // bRefresh
         0x00,                                   // bSynchAddress

features/unsupported/USBDevice/USBAudio/USBAudio.h

@@ -123,11 +123,18 @@ class USBAudio: public USBDevice {
     */
     bool write(uint8_t * buf);
 
+    /** Audio Jitter value*/
+    enum AudioSampleCorrectType {
+        RemoveOneSample = -1,
+        NoCorrection = 0,
+        AddOneSample = 1
+    };
     /**
      * Write packet in endpoint fifo. assuming tx fifo is empty
      * @param buf pointer on the audio packet which will be sent
-     */
-    void writeSync(uint8_t *buf);
+     * @param jitter_nb : AudioSampleCorrecttype 
+	 **/
+    void writeSync(uint8_t *buf, AudioSampleCorrectType jitter_nb = NoCorrection );
 
     /**
     * Write and read an audio packet at the same time (on the same frame)

features/unsupported/USBHost/USBHostHub/USBHostHub.cpp

@@ -227,6 +227,9 @@ void USBHostHub::portReset(uint8_t port) {
 #endif
     while(1) {
         status = getPortStatus(port);
+        /*  disconnection since reset request */
+        if (!(status & PORT_CONNECTION))
+            break;
         if (status & (PORT_ENABLE | PORT_RESET))
             break;
         if (status & PORT_OVER_CURRENT) {

targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_K66F/device/TOOLCHAIN_GCC_ARM/MK66FN2M0xxx18.ld

@@ -223,7 +223,7 @@ SECTIONS
     . = ALIGN(4);
     __bss_end__ = .;
     __END_BSS = .;
-  } > m_data
+  } > m_data_2
 
   .heap :
   {

targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_KW24D/TARGET_FRDM/PeripheralPins.c

@@ -57,14 +57,14 @@ const PinMap PinMap_UART_TX[] = {
     {PTA2,  UART_0, 2},
     {PTD7,  UART_0, 3},
     {PTC4,  UART_1, 3},
-    {PTE0,  UART_1, 3},    
+    {PTE0,  UART_1, 3},
     {PTD3,  UART_2, 3},
     {PTE16, UART_2, 3},
     {NC   , NC    , 0}
 };
 
 const PinMap PinMap_UART_RX[] = {
-    {PTA1,  UART_0, 2},    
+    {PTA1,  UART_0, 2},
     {PTD6,  UART_0, 3},
     {PTE1,  UART_1, 3},
     {PTD2,  UART_2, 3},
@@ -92,6 +92,7 @@ const PinMap PinMap_UART_RTS[] = {
 
 /************SPI***************/
 const PinMap PinMap_SPI_SCLK[] = {
+    {PTB11, SPI_1, 2},
     {PTC5,  SPI_0, 2},
     {PTD1,  SPI_0, 2},
     {PTE2,  SPI_1, 2},
@@ -100,6 +101,7 @@ const PinMap PinMap_SPI_SCLK[] = {
 };
 
 const PinMap PinMap_SPI_MOSI[] = {
+    {PTB16, SPI_1, 2},
     {PTC6,  SPI_0, 2},
     {PTD2,  SPI_0, 2},
     {PTE1,  SPI_1, 2},
@@ -109,6 +111,7 @@ const PinMap PinMap_SPI_MOSI[] = {
 };
 
 const PinMap PinMap_SPI_MISO[] = {
+    {PTB17, SPI_1, 2},
     {PTC7,  SPI_0, 2},
     {PTD3,  SPI_0, 2},
     {PTE1,  SPI_1, 7},
@@ -118,6 +121,7 @@ const PinMap PinMap_SPI_MISO[] = {
 };
 
 const PinMap PinMap_SPI_SSEL[] = {
+    {PTB10, SPI_1, 2},
     {PTC4,  SPI_0, 2},
     {PTE4,  SPI_1, 2},
     {PTE16, SPI_0, 2},

targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_KW24D/TARGET_FRDM/PinNames.h

@@ -87,11 +87,16 @@ typedef enum {
     USBTX = PTE0,
     USBRX = PTE1,
 
+    // Not connected
+    NC = (int)0xFFFFFFFF,
+
     // Arduino Headers
     D0 = PTD7,
     D1 = PTD6,
     D2 = PTD5,
     D3 = PTD4,
+    D4 = NC,
+    D5 = NC,
     D6 = PTE4,
     D7 = PTD1,
     D8 = PTA19,
@@ -106,8 +111,12 @@ typedef enum {
     I2C_SCL = D15,
     I2C_SDA = D14,
 
-    // Not connected
-    NC = (int)0xFFFFFFFF
+    A0 = NC,
+    A1 = NC,
+    A2 = NC,
+    A3 = NC,
+    A4 = NC,
+    A5 = NC
 } PinName;
 
 

targets/TARGET_NORDIC/TARGET_NRF5/serial_api.c

@@ -199,12 +199,13 @@ void UART_IRQ_HANDLER(void)
 
     #if DEVICE_SERIAL_ASYNCH
         if (UART_CB.tx_active) {
-            if (++UART_CB.tx_pos <= UART_CB.tx_length) {
+            if (UART_CB.tx_pos < UART_CB.tx_length) {
                 // When there is still something to send, clear the TXDRDY event
                 // and put next byte to transmitter.
                 nrf_uart_event_clear(UART_INSTANCE, NRF_UART_EVENT_TXDRDY);
                 nrf_uart_txd_set(UART_INSTANCE,
                     UART_CB.tx_buffer[UART_CB.tx_pos]);
+                UART_CB.tx_pos++;
             }
             else {
                 // When the TXDRDY event is set after the last byte to be sent