Added support to the MIDI Class drivers for packed data, where multiple MIDI events...

diff --git a/Demos/Device/ClassDriver/MIDI/MIDI.c b/Demos/Device/ClassDriver/MIDI/MIDI.c
index 419de16..5c0f25e 100644 (file)
--- a/Demos/Device/ClassDriver/MIDI/MIDI.c
+++ b/Demos/Device/ClassDriver/MIDI/MIDI.c
@@ -158,6 +158,7 @@ void CheckJoystickMovement(void)
                        };\r
                        \r
                MIDI_Device_SendEventPacket(&Keyboard_MIDI_Interface, &MIDIEvent);\r
                        };\r
                        \r
                MIDI_Device_SendEventPacket(&Keyboard_MIDI_Interface, &MIDIEvent);\r

+               MIDI_Device_Flush(&Keyboard_MIDI_Interface);\r

        }\r
 \r
        PrevJoystickStatus = JoystickStatus;\r
        }\r
 \r
        PrevJoystickStatus = JoystickStatus;\r

diff --git a/Demos/Host/ClassDriver/MIDIHost/MIDIHost.c b/Demos/Host/ClassDriver/MIDIHost/MIDIHost.c
index 098a7fe..64e6519 100644 (file)
--- a/Demos/Host/ClassDriver/MIDIHost/MIDIHost.c
+++ b/Demos/Host/ClassDriver/MIDIHost/MIDIHost.c
@@ -203,6 +203,7 @@ void CheckJoystickMovement(void)
                        };\r
                        \r
                MIDI_Host_SendEventPacket(&Keyboard_MIDI_Interface, &MIDIEvent);\r
                        };\r
                        \r
                MIDI_Host_SendEventPacket(&Keyboard_MIDI_Interface, &MIDIEvent);\r

+               MIDI_Host_Flush(&Keyboard_MIDI_Interface);\r

        }\r
 \r
        PrevJoystickStatus = JoystickStatus;\r
        }\r
 \r
        PrevJoystickStatus = JoystickStatus;\r

diff --git a/Demos/Host/LowLevel/RNDISEthernetHost/ConfigDescriptor.c b/Demos/Host/LowLevel/RNDISEthernetHost/ConfigDescriptor.c
index 742a542..7078f5e 100644 (file)
--- a/Demos/Host/LowLevel/RNDISEthernetHost/ConfigDescriptor.c
+++ b/Demos/Host/LowLevel/RNDISEthernetHost/ConfigDescriptor.c
@@ -158,7 +158,7 @@ uint8_t ProcessConfigurationDescriptor(void)
                        }\r
                        else\r
                        {\r
                        }\r
                        else\r
                        {\r

-                               /* Only configure the OUT data pipe if the data endpoints haev not shown to be bidirectional */\r
+                               /* Only configure the OUT data pipe if the data endpoints have not shown to be bidirectional */\r

                                if (!(Pipe_IsEndpointBound(EndpointData->EndpointAddress)))\r
                                {\r
                                        /* Configure the data OUT pipe */\r
                                if (!(Pipe_IsEndpointBound(EndpointData->EndpointAddress)))\r
                                {\r
                                        /* Configure the data OUT pipe */\r

diff --git a/Demos/Host/LowLevel/VirtualSerialHost/ConfigDescriptor.c b/Demos/Host/LowLevel/VirtualSerialHost/ConfigDescriptor.c
index 3d67269..c42cc0f 100644 (file)
--- a/Demos/Host/LowLevel/VirtualSerialHost/ConfigDescriptor.c
+++ b/Demos/Host/LowLevel/VirtualSerialHost/ConfigDescriptor.c
@@ -158,7 +158,7 @@ uint8_t ProcessConfigurationDescriptor(void)
                        }\r
                        else\r
                        {\r
                        }\r
                        else\r
                        {\r

-                               /* Only configure the OUT data pipe if the data endpoints haev not shown to be bidirectional */\r
+                               /* Only configure the OUT data pipe if the data endpoints have not shown to be bidirectional */\r

                                if (!(Pipe_IsEndpointBound(EndpointData->EndpointAddress)))\r
                                {\r
                                        /* Configure the data OUT pipe */\r
                                if (!(Pipe_IsEndpointBound(EndpointData->EndpointAddress)))\r
                                {\r
                                        /* Configure the data OUT pipe */\r

diff --git a/LUFA/Drivers/USB/Class/Device/CDC.h b/LUFA/Drivers/USB/Class/Device/CDC.h
index 30d3526..617410b 100644 (file)
--- a/LUFA/Drivers/USB/Class/Device/CDC.h
+++ b/LUFA/Drivers/USB/Class/Device/CDC.h
@@ -155,7 +155,9 @@
                        void EVENT_CDC_Device_ControLineStateChanged(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1);\r
 \r
                        /** Sends a given string to the attached USB host, if connected. If a host is not connected when the function is called, the\r
                        void EVENT_CDC_Device_ControLineStateChanged(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1);\r
 \r
                        /** Sends a given string to the attached USB host, if connected. If a host is not connected when the function is called, the\r

-                        *  string is discarded.\r
+                        *  string is discarded. Bytes will be queued for transmission to the host until either the endpoint bank becomes full, or the\r
+                        *  \ref CDC_Device_Flush() function is called to flush the pending data to the host. This allows for multiple bytes to be \r
+                        *  packed into a single endpoint packet, increasing data throughput.\r

                         *\r
                         *  \note This function must only be called when the Device state machine is in the DEVICE_STATE_Configured state or\r
                         *        the call will fail.\r
                         *\r
                         *  \note This function must only be called when the Device state machine is in the DEVICE_STATE_Configured state or\r
                         *        the call will fail.\r


@@ -170,7 +172,9 @@
                                                      ATTR_NON_NULL_PTR_ARG(1) ATTR_NON_NULL_PTR_ARG(2);\r
                        \r
                        /** Sends a given byte to the attached USB host, if connected. If a host is not connected when the function is called, the\r
                                                      ATTR_NON_NULL_PTR_ARG(1) ATTR_NON_NULL_PTR_ARG(2);\r
                        \r
                        /** Sends a given byte to the attached USB host, if connected. If a host is not connected when the function is called, the\r

-                        *  byte is discarded.\r
+                        *  byte is discarded. Bytes will be queued for transmission to the host until either the endpoint bank becomes full, or the\r
+                        *  \ref CDC_Device_Flush() function is called to flush the pending data to the host. This allows for multiple bytes to be \r
+                        *  packed into a single endpoint packet, increasing data throughput.\r

                         *\r
                         *  \note This function must only be called when the Device state machine is in the DEVICE_STATE_Configured state or\r
                         *        the call will fail.\r
                         *\r
                         *  \note This function must only be called when the Device state machine is in the DEVICE_STATE_Configured state or\r
                         *        the call will fail.\r

diff --git a/LUFA/Drivers/USB/Class/Device/MIDI.c b/LUFA/Drivers/USB/Class/Device/MIDI.c
index bc191d7..b72c2b0 100644 (file)
--- a/LUFA/Drivers/USB/Class/Device/MIDI.c
+++ b/LUFA/Drivers/USB/Class/Device/MIDI.c
@@ -79,12 +79,33 @@ uint8_t MIDI_Device_SendEventPacket(USB_ClassInfo_MIDI_Device_t* const MIDIInter
                if ((ErrorCode = Endpoint_Write_Stream_LE(Event, sizeof(MIDI_EventPacket_t), NO_STREAM_CALLBACK)) != ENDPOINT_RWSTREAM_NoError)\r
                  return ErrorCode;\r
 \r
                if ((ErrorCode = Endpoint_Write_Stream_LE(Event, sizeof(MIDI_EventPacket_t), NO_STREAM_CALLBACK)) != ENDPOINT_RWSTREAM_NoError)\r
                  return ErrorCode;\r
 \r

-               Endpoint_ClearIN();\r
+               if (!(Endpoint_IsReadWriteAllowed()))\r
+                 Endpoint_ClearIN();\r

        }\r
        \r
        return ENDPOINT_RWSTREAM_NoError;\r
 }\r
 \r
        }\r
        \r
        return ENDPOINT_RWSTREAM_NoError;\r
 }\r
 \r

+uint8_t MIDI_Device_Flush(USB_ClassInfo_MIDI_Device_t* const MIDIInterfaceInfo)\r
+{\r
+       if (USB_DeviceState != DEVICE_STATE_Configured)\r
+         return ENDPOINT_RWSTREAM_DeviceDisconnected;\r
+       \r
+       uint8_t ErrorCode;\r
+\r
+       Endpoint_SelectEndpoint(MIDIInterfaceInfo->Config.DataINEndpointNumber);\r
+\r
+       if (Endpoint_BytesInEndpoint())\r
+       {\r
+               Endpoint_ClearIN();\r
+\r
+               if ((ErrorCode = Endpoint_WaitUntilReady()) != ENDPOINT_READYWAIT_NoError)\r
+                 return ErrorCode;\r
+       }\r
+\r
+       return ENDPOINT_READYWAIT_NoError;\r
+}\r
+\r

 bool MIDI_Device_ReceiveEventPacket(USB_ClassInfo_MIDI_Device_t* const MIDIInterfaceInfo, MIDI_EventPacket_t* const Event)\r
 {\r
        if (USB_DeviceState != DEVICE_STATE_Configured)\r
 bool MIDI_Device_ReceiveEventPacket(USB_ClassInfo_MIDI_Device_t* const MIDIInterfaceInfo, MIDI_EventPacket_t* const Event)\r
 {\r
        if (USB_DeviceState != DEVICE_STATE_Configured)\r


@@ -96,7 +117,9 @@ bool MIDI_Device_ReceiveEventPacket(USB_ClassInfo_MIDI_Device_t* const MIDIInter
          return false;\r
 \r
        Endpoint_Read_Stream_LE(Event, sizeof(MIDI_EventPacket_t), NO_STREAM_CALLBACK);\r
          return false;\r
 \r
        Endpoint_Read_Stream_LE(Event, sizeof(MIDI_EventPacket_t), NO_STREAM_CALLBACK);\r

-       Endpoint_ClearOUT();\r
+       \r
+       if (!(Endpoint_IsReadWriteAllowed()))\r
+         Endpoint_ClearOUT();\r

        \r
        return true;\r
 }\r
        \r
        return true;\r
 }\r

diff --git a/LUFA/Drivers/USB/Class/Device/MIDI.h b/LUFA/Drivers/USB/Class/Device/MIDI.h
index fef7890..8517782 100644 (file)
--- a/LUFA/Drivers/USB/Class/Device/MIDI.h
+++ b/LUFA/Drivers/USB/Class/Device/MIDI.h
@@ -104,7 +104,9 @@
                         */             \r
                        void MIDI_Device_ProcessControlRequest(USB_ClassInfo_MIDI_Device_t* const MIDIInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1);\r
 \r
                         */             \r
                        void MIDI_Device_ProcessControlRequest(USB_ClassInfo_MIDI_Device_t* const MIDIInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1);\r
 \r

-                       /** Sends a MIDI event packet to the host. If no host is connected, the event packet is discarded.\r
+                       /** Sends a MIDI event packet to the host. If no host is connected, the event packet is discarded. Events are queued into the\r
+                        *  endpoint bank until either the endpoint bank is full, or \ref MIDI_Device_Flush() is called. This allows for multiple\r
+                        *  MIDI events to be packed into a single endpoint packet, increasing data throughput.\r

                         *\r
                         *  \note This function must only be called when the Device state machine is in the DEVICE_STATE_Configured state or\r
                         *        the call will fail.\r
                         *\r
                         *  \note This function must only be called when the Device state machine is in the DEVICE_STATE_Configured state or\r
                         *        the call will fail.\r


@@ -117,7 +119,18 @@
                        uint8_t MIDI_Device_SendEventPacket(USB_ClassInfo_MIDI_Device_t* const MIDIInterfaceInfo,\r
                                                            MIDI_EventPacket_t* const Event) ATTR_NON_NULL_PTR_ARG(1) ATTR_NON_NULL_PTR_ARG(2);\r
 \r
                        uint8_t MIDI_Device_SendEventPacket(USB_ClassInfo_MIDI_Device_t* const MIDIInterfaceInfo,\r
                                                            MIDI_EventPacket_t* const Event) ATTR_NON_NULL_PTR_ARG(1) ATTR_NON_NULL_PTR_ARG(2);\r
 \r

-                       /** Receives a MIDI event packet from the host.\r
+\r
+                       /** Flushes the MIDI send buffer, sending any queued MIDI events to the host. This should be called to override the\r
+                        *  \ref MIDI_Device_SendEventPacket() function's packing behaviour, to flush queued events.\r
+                        *\r
+                        *  \param[in,out] MIDIInterfaceInfo  Pointer to a structure containing a MIDI Class configuration and state\r
+                        *\r
+                        *  \return A value from the \ref Endpoint_WaitUntilReady_ErrorCodes_t enum\r
+                        */\r
+                       uint8_t MIDI_Device_Flush(USB_ClassInfo_MIDI_Device_t* const MIDIInterfaceInfo);\r
+\r
+                       /** Receives a MIDI event packet from the host. Events are unpacked from the endpoint, thus if the endpoint bank contains\r
+                        *  multiple MIDI events from the host in the one packet, multiple calls to this function will return each individual event.\r

                         *\r
                         *  \note This function must only be called when the Device state machine is in the DEVICE_STATE_Configured state or\r
                         *        the call will fail.\r
                         *\r
                         *  \note This function must only be called when the Device state machine is in the DEVICE_STATE_Configured state or\r
                         *        the call will fail.\r

diff --git a/LUFA/Drivers/USB/Class/Host/CDC.h b/LUFA/Drivers/USB/Class/Host/CDC.h
index 20ee320..dbc1f9e 100644 (file)
--- a/LUFA/Drivers/USB/Class/Host/CDC.h
+++ b/LUFA/Drivers/USB/Class/Host/CDC.h
@@ -175,7 +175,9 @@
                        uint8_t CDC_Host_SendControlLineStateChange(USB_ClassInfo_CDC_Host_t* const CDCInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1);\r
                        \r
                        /** Sends a given string to the attached USB device, if connected. If a device is not connected when the function is called, the\r
                        uint8_t CDC_Host_SendControlLineStateChange(USB_ClassInfo_CDC_Host_t* const CDCInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1);\r
                        \r
                        /** Sends a given string to the attached USB device, if connected. If a device is not connected when the function is called, the\r

-                        *  string is discarded.\r
+                        *  string is discarded. Bytes will be queued for transmission to the device until either the pipe bank becomes full, or the\r
+                        *  \ref CDC_Host_Flush() function is called to flush the pending data to the host. This allows for multiple bytes to be \r
+                        *  packed into a single pipe packet, increasing data throughput.\r

                         *\r
                         *  \note This function must only be called when the Host state machine is in the HOST_STATE_Configured state or the\r
                         *        call will fail.\r
                         *\r
                         *  \note This function must only be called when the Host state machine is in the HOST_STATE_Configured state or the\r
                         *        call will fail.\r


@@ -189,8 +191,10 @@
                        uint8_t CDC_Host_SendString(USB_ClassInfo_CDC_Host_t* const CDCInterfaceInfo, char* Data, const uint16_t Length)\r
                                                    ATTR_NON_NULL_PTR_ARG(1) ATTR_NON_NULL_PTR_ARG(2);\r
                        \r
                        uint8_t CDC_Host_SendString(USB_ClassInfo_CDC_Host_t* const CDCInterfaceInfo, char* Data, const uint16_t Length)\r
                                                    ATTR_NON_NULL_PTR_ARG(1) ATTR_NON_NULL_PTR_ARG(2);\r
                        \r

-                       /** Sends a given byte to the attached USB device, if connected. If a host is not connected when the function is called, the\r
-                        *  byte is discarded.\r
+                       /** Sends a given byte to the attached USB device, if connected. If a device is not connected when the function is called, the\r
+                        *  byte is discarded. Bytes will be queued for transmission to the device until either the pipe bank becomes full, or the\r
+                        *  \ref CDC_Host_Flush() function is called to flush the pending data to the host. This allows for multiple bytes to be \r
+                        *  packed into a single pipe packet, increasing data throughput.\r

                         *\r
                         *  \note This function must only be called when the Host state machine is in the HOST_STATE_Configured state or the\r
                         *        call will fail.\r
                         *\r
                         *  \note This function must only be called when the Host state machine is in the HOST_STATE_Configured state or the\r
                         *        call will fail.\r

diff --git a/LUFA/Drivers/USB/Class/Host/MIDI.c b/LUFA/Drivers/USB/Class/Host/MIDI.c
index 3cb0df6..a5ad4bf 100644 (file)
--- a/LUFA/Drivers/USB/Class/Host/MIDI.c
+++ b/LUFA/Drivers/USB/Class/Host/MIDI.c
@@ -122,6 +122,26 @@ static uint8_t DComp_MIDI_Host_NextMIDIStreamingDataEndpoint(void* const Current
        return DESCRIPTOR_SEARCH_NotFound;\r
 }\r
 \r
        return DESCRIPTOR_SEARCH_NotFound;\r
 }\r
 \r

+uint8_t MIDI_Host_Flush(USB_ClassInfo_MIDI_Host_t* const MIDIInterfaceInfo)\r
+{\r
+       if (USB_HostState != HOST_STATE_Configured)\r
+         return PIPE_RWSTREAM_DeviceDisconnected;\r
+       \r
+       uint8_t ErrorCode;\r
+\r
+       Pipe_SelectPipe(MIDIInterfaceInfo->Config.DataOUTPipeNumber);\r
+\r
+       if (Pipe_BytesInPipe())\r
+       {\r
+               Pipe_ClearOUT();\r
+\r
+               if ((ErrorCode = Pipe_WaitUntilReady()) != PIPE_READYWAIT_NoError)\r
+                 return ErrorCode;\r
+       }\r
+\r
+       return PIPE_READYWAIT_NoError;\r
+}\r
+\r

 uint8_t MIDI_Host_SendEventPacket(USB_ClassInfo_MIDI_Host_t* const MIDIInterfaceInfo, MIDI_EventPacket_t* const Event)\r
 {\r
        if ((USB_HostState != HOST_STATE_Configured) || !(MIDIInterfaceInfo->State.IsActive))\r
 uint8_t MIDI_Host_SendEventPacket(USB_ClassInfo_MIDI_Host_t* const MIDIInterfaceInfo, MIDI_EventPacket_t* const Event)\r
 {\r
        if ((USB_HostState != HOST_STATE_Configured) || !(MIDIInterfaceInfo->State.IsActive))\r


@@ -136,7 +156,8 @@ uint8_t MIDI_Host_SendEventPacket(USB_ClassInfo_MIDI_Host_t* const MIDIInterface
                if ((ErrorCode = Pipe_Write_Stream_LE(Event, sizeof(MIDI_EventPacket_t), NO_STREAM_CALLBACK)) != PIPE_RWSTREAM_NoError)\r
                  return ErrorCode;\r
 \r
                if ((ErrorCode = Pipe_Write_Stream_LE(Event, sizeof(MIDI_EventPacket_t), NO_STREAM_CALLBACK)) != PIPE_RWSTREAM_NoError)\r
                  return ErrorCode;\r
 \r

-               Pipe_ClearOUT();\r
+               if (!(Pipe_IsReadWriteAllowed()))\r
+                 Pipe_ClearOUT();\r

        }\r
        \r
        return PIPE_RWSTREAM_NoError;\r
        }\r
        \r
        return PIPE_RWSTREAM_NoError;\r


@@ -153,7 +174,9 @@ bool MIDI_Host_ReceiveEventPacket(USB_ClassInfo_MIDI_Host_t* const MIDIInterface
          return false;\r
 \r
        Pipe_Read_Stream_LE(Event, sizeof(MIDI_EventPacket_t), NO_STREAM_CALLBACK);\r
          return false;\r
 \r
        Pipe_Read_Stream_LE(Event, sizeof(MIDI_EventPacket_t), NO_STREAM_CALLBACK);\r

-       Pipe_ClearIN();\r
+\r
+       if (!(Pipe_IsReadWriteAllowed()))\r
+         Pipe_ClearIN();\r

        \r
        return true;\r
 }\r
        \r
        return true;\r
 }\r

diff --git a/LUFA/Drivers/USB/Class/Host/MIDI.h b/LUFA/Drivers/USB/Class/Host/MIDI.h
index b1971b1..7b1cba3 100644 (file)
--- a/LUFA/Drivers/USB/Class/Host/MIDI.h
+++ b/LUFA/Drivers/USB/Class/Host/MIDI.h
@@ -125,6 +125,17 @@
                        uint8_t MIDI_Host_SendEventPacket(USB_ClassInfo_MIDI_Host_t* const MIDIInterfaceInfo,\r
                                                          MIDI_EventPacket_t* const Event) ATTR_NON_NULL_PTR_ARG(1) ATTR_NON_NULL_PTR_ARG(2);\r
 \r
                        uint8_t MIDI_Host_SendEventPacket(USB_ClassInfo_MIDI_Host_t* const MIDIInterfaceInfo,\r
                                                          MIDI_EventPacket_t* const Event) ATTR_NON_NULL_PTR_ARG(1) ATTR_NON_NULL_PTR_ARG(2);\r
 \r

+                       /** Flushes the MIDI send buffer, sending any queued MIDI events to the device. This should be called to override the\r
+                        *  \ref MIDI_Host_SendEventPacket() function's packing behaviour, to flush queued events. Events are queued into the\r
+                        *  pipe bank until either the pipe bank is full, or \ref MIDI_Host_Flush() is called. This allows for multiple MIDI\r
+                        *  events to be packed into a single pipe packet, increasing data throughput.\r
+                        *\r
+                        *  \param[in,out] MIDIInterfaceInfo  Pointer to a structure containing a MIDI Class configuration and state\r
+                        *\r
+                        *  \return A value from the \ref Pipe_WaitUntilReady_ErrorCodes_t enum\r
+                        */\r
+                        uint8_t MIDI_Host_Flush(USB_ClassInfo_MIDI_Host_t* const MIDIInterfaceInfo);\r
+                        \r

                        /** Receives a MIDI event packet from the device.\r
                         *\r
                         *  \note This function must only be called when the Host state machine is in the HOST_STATE_Configured state or the\r
                        /** Receives a MIDI event packet from the device.\r
                         *\r
                         *  \note This function must only be called when the Host state machine is in the HOST_STATE_Configured state or the\r

diff --git a/LUFA/ManPages/ChangeLog.txt b/LUFA/ManPages/ChangeLog.txt
index 7d75907..9a38025 100644 (file)
--- a/LUFA/ManPages/ChangeLog.txt
+++ b/LUFA/ManPages/ChangeLog.txt
@@ -14,6 +14,9 @@
   *    to a target\r
   *  - Added new TemperatureDataLogger application, a USB data logger which writes to the device's dataflash and appears to\r
   *    the host as a standard Mass Storage device when inserted\r
   *    to a target\r
   *  - Added new TemperatureDataLogger application, a USB data logger which writes to the device's dataflash and appears to\r
   *    the host as a standard Mass Storage device when inserted\r

+  *  - Added MIDI event packing support to the MIDI Device and Host mode Class drivers, allowing for multiple MIDI events to\r
+  *    sent or received in packed form in a single USB packet\r
+  *  - Added new MIDI send buffer flush routines to the MIDI Device and Host mode Class drivers, to flush packed events\r

   *\r
   *  <b>Changed:</b>\r
   *  - Slowed down bit-banged PDI programming in the AVRISP project slightly to prevent transmission errors\r
   *\r
   *  <b>Changed:</b>\r
   *  - Slowed down bit-banged PDI programming in the AVRISP project slightly to prevent transmission errors\r

diff --git a/LUFA/ManPages/MigrationInformation.txt b/LUFA/ManPages/MigrationInformation.txt
index d93b4e8..cf81901 100644 (file)
--- a/LUFA/ManPages/MigrationInformation.txt
+++ b/LUFA/ManPages/MigrationInformation.txt
@@ -12,7 +12,17 @@
  *\r
  * \section Sec_MigrationXXXXXX Migrating from 091223 to XXXXXX\r
  *\r
  *\r
  * \section Sec_MigrationXXXXXX Migrating from 091223 to XXXXXX\r
  *\r

- *  <i>There is no migration information for this release.</i>\r
+ *  <b>Host Mode</b>\r
+ *    - The MIDI Host Class driver send and receive routines now operate on packed events, where multiple MIDI events may be\r
+ *      packed into a single USB packet. This means that the sending of MIDI events will now be delayed until the MIDI send\r
+ *      pipe bank is full. To override this new behaviour and revert to the previous behaviour, the user application may manually\r
+ *      flush the queued event(s) to the device by calling \ref MIDI_Host_Flush().\r
+ *\r
+ *  <b>Device Mode</b>\r
+ *    - The MIDI Device Class driver send and receive routines now operate on packed events, where multiple MIDI events may be\r
+ *      packed into a single USB packet. This means that the sending of MIDI events will now be delayed until the MIDI send\r
+ *      endpoint bank is full. To override this new behaviour and revert to the previous behaviour, the user application may manually\r
+ *      flush the queued event(s) to the host by calling \ref MIDI_Device_Flush().\r

  *\r
  * \section Sec_Migration091223 Migrating from 091122 to 091223\r
  *\r
  *\r
  * \section Sec_Migration091223 Migrating from 091122 to 091223\r
  *\r

diff --git a/Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.c b/Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.c
index 9889ab6..f0687b8 100644 (file)
--- a/Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.c
+++ b/Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.c
@@ -226,6 +226,9 @@ void XPROGTarget_EnableTargetTPI(void)
 /** Disables the target's PDI interface, exits programming mode and starts the target's application. */\r
 void XPROGTarget_DisableTargetPDI(void)\r
 {\r
 /** Disables the target's PDI interface, exits programming mode and starts the target's application. */\r
 void XPROGTarget_DisableTargetPDI(void)\r
 {\r

+       /* Switch to Rx mode to ensure that all pending transmissions are complete */\r
+       XPROGTarget_SetRxMode();\r
+\r

 #if defined(XPROG_VIA_HARDWARE_USART)\r
        /* Turn off receiver and transmitter of the USART, clear settings */\r
        UCSR1A |= (1 << TXC1) | (1 << RXC1);\r
 #if defined(XPROG_VIA_HARDWARE_USART)\r
        /* Turn off receiver and transmitter of the USART, clear settings */\r
        UCSR1A |= (1 << TXC1) | (1 << RXC1);\r


@@ -249,6 +252,9 @@ void XPROGTarget_DisableTargetPDI(void)
 /** Disables the target's TPI interface, exits programming mode and starts the target's application. */\r
 void XPROGTarget_DisableTargetTPI(void)\r
 {\r
 /** Disables the target's TPI interface, exits programming mode and starts the target's application. */\r
 void XPROGTarget_DisableTargetTPI(void)\r
 {\r

+       /* Switch to Rx mode to ensure that all pending transmissions are complete */\r
+       XPROGTarget_SetRxMode();\r
+\r

 #if defined(XPROG_VIA_HARDWARE_USART)\r
        /* Turn off receiver and transmitter of the USART, clear settings */\r
        UCSR1A |= (1 << TXC1) | (1 << RXC1);\r
 #if defined(XPROG_VIA_HARDWARE_USART)\r
        /* Turn off receiver and transmitter of the USART, clear settings */\r
        UCSR1A |= (1 << TXC1) | (1 << RXC1);\r