X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/b2330934b9ccd51a59183eb2a11fdd95183df27b..eff07bb87758a12064d9de9c859b1e6e6502f2ea:/Demos/Device/ClassDriver/RNDISEthernet/RNDISEthernet.c

diff --git a/Demos/Device/ClassDriver/RNDISEthernet/RNDISEthernet.c b/Demos/Device/ClassDriver/RNDISEthernet/RNDISEthernet.c
index 8c55dff3b..81d31c9cd 100644
--- 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
  *  within a device can be differentiated from one another.
  */
-USB_ClassInfo_RNDIS_t Ethernet_RNDIS_Interface =
+USB_ClassInfo_RNDIS_Device_t Ethernet_RNDIS_Interface =
 	{
-		.ControlInterfaceNumber     = 0,
-
-		.DataINEndpointNumber       = CDC_TX_EPNUM,
-		.DataINEndpointSize         = CDC_TXRX_EPSIZE,
-
-		.DataOUTEndpointNumber      = CDC_RX_EPNUM,
-		.DataOUTEndpointSize        = CDC_TXRX_EPSIZE,
-
-		.NotificationEndpointNumber = CDC_NOTIFICATION_EPNUM,
-		.NotificationEndpointSize   = CDC_NOTIFICATION_EPSIZE,
-		
-		.AdapterVendorDescription   = "LUFA RNDIS Demo Adapter",
-		.AdapterMACAddress          = {ADAPTER_MAC_ADDRESS},
+		.Config =
+			{
+				.ControlInterfaceNumber     = 0,
+
+				.DataINEndpointNumber       = CDC_TX_EPNUM,
+				.DataINEndpointSize         = CDC_TXRX_EPSIZE,
+
+				.DataOUTEndpointNumber      = CDC_RX_EPNUM,
+				.DataOUTEndpointSize        = CDC_TXRX_EPSIZE,
+
+				.NotificationEndpointNumber = CDC_NOTIFICATION_EPNUM,
+				.NotificationEndpointSize   = CDC_NOTIFICATION_EPSIZE,
+				
+				.AdapterVendorDescription   = "LUFA RNDIS Demo Adapter",
+				.AdapterMACAddress          = {ADAPTER_MAC_ADDRESS},
+			},
 	};
 
 /** Main program entry point. This routine contains the overall program flow, including initial
@@ -73,16 +76,16 @@ int main(void)
 
 	for (;;)
 	{
-		if (Ethernet_RNDIS_Interface.FrameIN.FrameInBuffer)
+		if (Ethernet_RNDIS_Interface.State.FrameIN.FrameInBuffer)
 		{
 			LEDs_SetAllLEDs(LEDMASK_USB_BUSY);
-			Ethernet_ProcessPacket(&Ethernet_RNDIS_Interface.FrameIN, &Ethernet_RNDIS_Interface.FrameOUT);
+			Ethernet_ProcessPacket(&Ethernet_RNDIS_Interface.State.FrameIN, &Ethernet_RNDIS_Interface.State.FrameOUT);
 			LEDs_SetAllLEDs(LEDMASK_USB_READY);
 		}
 
 		TCP_TCPTask(&Ethernet_RNDIS_Interface);
 
-		USB_RNDIS_USBTask(&Ethernet_RNDIS_Interface);
+		RNDIS_Device_USBTask(&Ethernet_RNDIS_Interface);
 		USB_USBTask();
 	}
 }
@@ -120,12 +123,12 @@ void EVENT_USB_ConfigurationChanged(void)
 {
 	LEDs_SetAllLEDs(LEDMASK_USB_READY);
 
-	if (!(USB_RNDIS_ConfigureEndpoints(&Ethernet_RNDIS_Interface)))
+	if (!(RNDIS_Device_ConfigureEndpoints(&Ethernet_RNDIS_Interface)))
 	  LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
 }
 
 /** Event handler for the library USB Unhandled Control Packet event. */
 void EVENT_USB_UnhandledControlPacket(void)
 {
-	USB_RNDIS_ProcessControlPacket(&Ethernet_RNDIS_Interface);
+	RNDIS_Device_ProcessControlPacket(&Ethernet_RNDIS_Interface);
 }