Fix accidentally changed code breaking the HID descriptor parser.

[pub/USBasp.git] / Demos / Device / ClassDriver / RNDISEthernet / RNDISEthernet.c

diff --git a/Demos/Device/ClassDriver/RNDISEthernet/RNDISEthernet.c b/Demos/Device/ClassDriver/RNDISEthernet/RNDISEthernet.c
index 8c55dff..905f4ef 100644 (file)
--- a/Demos/Device/ClassDriver/RNDISEthernet/RNDISEthernet.c
+++ b/Demos/Device/ClassDriver/RNDISEthernet/RNDISEthernet.c
@@ -40,21 +40,24 @@
  *  passed to all RNDIS Class driver functions, so that multiple instances of the same class\r
  *  within a device can be differentiated from one another.\r
  */\r
  *  passed to all RNDIS Class driver functions, so that multiple instances of the same class\r
  *  within a device can be differentiated from one another.\r
  */\r

-USB_ClassInfo_RNDIS_t Ethernet_RNDIS_Interface =\r
+USB_ClassInfo_RNDIS_Device_t Ethernet_RNDIS_Interface =\r

        {\r
        {\r

-               .ControlInterfaceNumber     = 0,\r
-\r
-               .DataINEndpointNumber       = CDC_TX_EPNUM,\r
-               .DataINEndpointSize         = CDC_TXRX_EPSIZE,\r
-\r
-               .DataOUTEndpointNumber      = CDC_RX_EPNUM,\r
-               .DataOUTEndpointSize        = CDC_TXRX_EPSIZE,\r
-\r
-               .NotificationEndpointNumber = CDC_NOTIFICATION_EPNUM,\r
-               .NotificationEndpointSize   = CDC_NOTIFICATION_EPSIZE,\r
-               \r
-               .AdapterVendorDescription   = "LUFA RNDIS Demo Adapter",\r
-               .AdapterMACAddress          = {ADAPTER_MAC_ADDRESS},\r
+               .Config =\r
+                       {\r
+                               .ControlInterfaceNumber     = 0,\r
+\r
+                               .DataINEndpointNumber       = CDC_TX_EPNUM,\r
+                               .DataINEndpointSize         = CDC_TXRX_EPSIZE,\r
+\r
+                               .DataOUTEndpointNumber      = CDC_RX_EPNUM,\r
+                               .DataOUTEndpointSize        = CDC_TXRX_EPSIZE,\r
+\r
+                               .NotificationEndpointNumber = CDC_NOTIFICATION_EPNUM,\r
+                               .NotificationEndpointSize   = CDC_NOTIFICATION_EPSIZE,\r
+                               \r
+                               .AdapterVendorDescription   = "LUFA RNDIS Demo Adapter",\r
+                               .AdapterMACAddress          = {ADAPTER_MAC_ADDRESS},\r
+                       },\r

        };\r
 \r
 /** Main program entry point. This routine contains the overall program flow, including initial\r
        };\r
 \r
 /** Main program entry point. This routine contains the overall program flow, including initial\r


@@ -73,16 +76,16 @@ int main(void)
 \r
        for (;;)\r
        {\r
 \r
        for (;;)\r
        {\r

-               if (Ethernet_RNDIS_Interface.FrameIN.FrameInBuffer)\r
+               if (Ethernet_RNDIS_Interface.State.FrameIN.FrameInBuffer)\r

                {\r
                        LEDs_SetAllLEDs(LEDMASK_USB_BUSY);\r
                {\r
                        LEDs_SetAllLEDs(LEDMASK_USB_BUSY);\r

-                       Ethernet_ProcessPacket(&Ethernet_RNDIS_Interface.FrameIN, &Ethernet_RNDIS_Interface.FrameOUT);\r
+                       Ethernet_ProcessPacket(&Ethernet_RNDIS_Interface.State.FrameIN, &Ethernet_RNDIS_Interface.State.FrameOUT);\r

                        LEDs_SetAllLEDs(LEDMASK_USB_READY);\r
                }\r
 \r
                TCP_TCPTask(&Ethernet_RNDIS_Interface);\r
 \r
                        LEDs_SetAllLEDs(LEDMASK_USB_READY);\r
                }\r
 \r
                TCP_TCPTask(&Ethernet_RNDIS_Interface);\r
 \r

-               USB_RNDIS_USBTask(&Ethernet_RNDIS_Interface);\r
+               RNDIS_Device_USBTask(&Ethernet_RNDIS_Interface);\r

                USB_USBTask();\r
        }\r
 }\r
                USB_USBTask();\r
        }\r
 }\r


@@ -104,28 +107,28 @@ void SetupHardware(void)
 }\r
 \r
 /** Event handler for the library USB Connection event. */\r
 }\r
 \r
 /** Event handler for the library USB Connection event. */\r

-void EVENT_USB_Connect(void)\r
+void EVENT_USB_Device_Connect(void)\r

 {\r
        LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);\r
 }\r
 \r
 /** Event handler for the library USB Disconnection event. */\r
 {\r
        LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);\r
 }\r
 \r
 /** Event handler for the library USB Disconnection event. */\r

-void EVENT_USB_Disconnect(void)\r
+void EVENT_USB_Device_Disconnect(void)\r

 {\r
        LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);\r
 }\r
 \r
 /** Event handler for the library USB Configuration Changed event. */\r
 {\r
        LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);\r
 }\r
 \r
 /** Event handler for the library USB Configuration Changed event. */\r

-void EVENT_USB_ConfigurationChanged(void)\r
+void EVENT_USB_Device_ConfigurationChanged(void)\r

 {\r
        LEDs_SetAllLEDs(LEDMASK_USB_READY);\r
 \r
 {\r
        LEDs_SetAllLEDs(LEDMASK_USB_READY);\r
 \r

-       if (!(USB_RNDIS_ConfigureEndpoints(&Ethernet_RNDIS_Interface)))\r
+       if (!(RNDIS_Device_ConfigureEndpoints(&Ethernet_RNDIS_Interface)))\r

          LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
 }\r
 \r
          LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
 }\r
 \r

-/** Event handler for the library USB Unhandled Control Packet event. */\r
-void EVENT_USB_UnhandledControlPacket(void)\r
+/** Event handler for the library USB Unhandled Control Request event. */\r
+void EVENT_USB_Device_UnhandledControlRequest(void)\r

 {\r
 {\r

-       USB_RNDIS_ProcessControlPacket(&Ethernet_RNDIS_Interface);\r
+       RNDIS_Device_ProcessControlRequest(&Ethernet_RNDIS_Interface);\r

 }\r
 }\r