Make sure that the NVM bus/controller busy waits in the AVRISP MKII clone project...
[pub/USBasp.git] / Demos / Host / ClassDriver / RNDISEthernetHost / RNDISEthernetHost.c
index d35d22a..c4f2d0e 100644 (file)
@@ -1,21 +1,21 @@
 /*\r
              LUFA Library\r
-     Copyright (C) Dean Camera, 2009.\r
+     Copyright (C) Dean Camera, 2010.\r
               \r
   dean [at] fourwalledcubicle [dot] com\r
       www.fourwalledcubicle.com\r
 */\r
 \r
 /*\r
-  Copyright 2009  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
-\r
-  Permission to use, copy, modify, and distribute this software\r
-  and its documentation for any purpose and without fee is hereby\r
-  granted, provided that the above copyright notice appear in all\r
-  copies and that both that the copyright notice and this\r
-  permission notice and warranty disclaimer appear in supporting\r
-  documentation, and that the name of the author not be used in\r
-  advertising or publicity pertaining to distribution of the\r
+  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
+\r
+  Permission to use, copy, modify, distribute, and sell this \r
+  software and its documentation for any purpose is hereby granted\r
+  without fee, provided that the above copyright notice appear in \r
+  all copies and that both that the copyright notice and this\r
+  permission notice and warranty disclaimer appear in supporting \r
+  documentation, and that the name of the author not be used in \r
+  advertising or publicity pertaining to distribution of the \r
   software without specific, written prior permission.\r
 \r
   The author disclaim all warranties with regard to this\r
@@ -36,7 +36,7 @@
  \r
 #include "RNDISEthernetHost.h"\r
 \r
-/** Buffer to hold incomming and outgoing Ethernet packets. */\r
+/** Buffer to hold incoming and outgoing Ethernet packets. */\r
 uint8_t PacketBuffer[1024];\r
 \r
 /** LUFA RNDIS Class driver interface configuration and state information. This structure is\r
@@ -70,6 +70,7 @@ int main(void)
        puts_P(PSTR(ESC_FG_CYAN "RNDIS Host Demo running.\r\n" ESC_FG_WHITE));\r
 \r
        LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);\r
+       sei();\r
 \r
        for (;;)\r
        {\r
@@ -84,7 +85,7 @@ int main(void)
                                if (USB_Host_GetDeviceConfigDescriptor(1, &ConfigDescriptorSize, ConfigDescriptorData,\r
                                                                       sizeof(ConfigDescriptorData)) != HOST_GETCONFIG_Successful)\r
                                {\r
-                                       printf("Error Retrieving Configuration Descriptor.\r\n");\r
+                                       puts_P(PSTR("Error Retrieving Configuration Descriptor.\r\n"));\r
                                        LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
                                        USB_HostState = HOST_STATE_WaitForDeviceRemoval;\r
                                        break;\r
@@ -93,7 +94,7 @@ int main(void)
                                if (RNDIS_Host_ConfigurePipes(&Ethernet_RNDIS_Interface,\r
                                                              ConfigDescriptorSize, ConfigDescriptorData) != RNDIS_ENUMERROR_NoError)\r
                                {\r
-                                       printf("Attached Device Not a Valid RNDIS Class Device.\r\n");\r
+                                       puts_P(PSTR("Attached Device Not a Valid RNDIS Class Device.\r\n"));\r
                                        LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
                                        USB_HostState = HOST_STATE_WaitForDeviceRemoval;\r
                                        break;\r
@@ -101,7 +102,7 @@ int main(void)
                                \r
                                if (USB_Host_SetDeviceConfiguration(1) != HOST_SENDCONTROL_Successful)\r
                                {\r
-                                       printf("Error Setting Device Configuration.\r\n");\r
+                                       puts_P(PSTR("Error Setting Device Configuration.\r\n"));\r
                                        LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
                                        USB_HostState = HOST_STATE_WaitForDeviceRemoval;\r
                                        break;\r
@@ -109,20 +110,20 @@ int main(void)
                                \r
                                if (RNDIS_Host_InitializeDevice(&Ethernet_RNDIS_Interface) != HOST_SENDCONTROL_Successful)\r
                                {\r
-                                       printf("Error Initializing Device.\r\n");\r
+                                       puts_P(PSTR("Error Initializing Device.\r\n"));\r
 \r
                                        LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
                                        USB_HostState = HOST_STATE_WaitForDeviceRemoval;\r
                                        break;                  \r
                                }\r
                                \r
-                               printf("Device Max Transfer Size: %lu bytes.\r\n", Ethernet_RNDIS_Interface.State.DeviceMaxPacketSize);\r
+                               printf_P(PSTR("Device Max Transfer Size: %lu bytes.\r\n"), Ethernet_RNDIS_Interface.State.DeviceMaxPacketSize);\r
                                \r
                                uint32_t PacketFilter = (REMOTE_NDIS_PACKET_DIRECTED | REMOTE_NDIS_PACKET_BROADCAST | REMOTE_NDIS_PACKET_ALL_MULTICAST);\r
                                if (RNDIS_Host_SetRNDISProperty(&Ethernet_RNDIS_Interface, OID_GEN_CURRENT_PACKET_FILTER,\r
                                                                &PacketFilter, sizeof(PacketFilter)) != HOST_SENDCONTROL_Successful)\r
                                {\r
-                                       printf("Error Setting Device Packet Filter.\r\n");\r
+                                       puts_P(PSTR("Error Setting Device Packet Filter.\r\n"));\r
 \r
                                        LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
                                        USB_HostState = HOST_STATE_WaitForDeviceRemoval;\r
@@ -133,20 +134,21 @@ int main(void)
                                if (RNDIS_Host_QueryRNDISProperty(&Ethernet_RNDIS_Interface, OID_GEN_VENDOR_ID,\r
                                                                  &VendorID, sizeof(VendorID)) != HOST_SENDCONTROL_Successful)\r
                                {\r
-                                       printf("Error Getting Vendor ID.\r\n");\r
+                                       puts_P(PSTR("Error Getting Vendor ID.\r\n"));\r
 \r
                                        LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
                                        USB_HostState = HOST_STATE_WaitForDeviceRemoval;\r
                                        break;\r
                                }\r
                                \r
-                               printf("Device Vendor ID: 0x%08lX\r\n", VendorID);\r
+                               printf_P(PSTR("Device Vendor ID: 0x%08lX\r\n"), VendorID);\r
 \r
-                               printf("RNDIS Device Enumerated.\r\n");\r
+                               puts_P(PSTR("RNDIS Device Enumerated.\r\n"));\r
+                               LEDs_SetAllLEDs(LEDMASK_USB_READY);\r
                                USB_HostState = HOST_STATE_Configured;\r
                                break;\r
                        case HOST_STATE_Configured:\r
-                               // TODO\r
+                               PrintIncomingPackets();\r
                        \r
                                break;\r
                }\r
@@ -156,6 +158,27 @@ int main(void)
        }\r
 }\r
 \r
+/** Prints incoming packets from the attached RNDIS device to the serial port. */\r
+void PrintIncomingPackets(void)\r
+{\r
+       if (RNDIS_Host_IsPacketReceived(&Ethernet_RNDIS_Interface))\r
+       {\r
+               LEDs_SetAllLEDs(LEDMASK_USB_BUSY);\r
+\r
+               uint16_t PacketLength;\r
+               RNDIS_Host_ReadPacket(&Ethernet_RNDIS_Interface, &PacketBuffer, &PacketLength);\r
+       \r
+               printf_P(PSTR("***PACKET (Size %d)***\r\n"), PacketLength);\r
+       \r
+               for (uint16_t i = 0; i < PacketLength; i++)\r
+                 printf("%02x ", PacketBuffer[i]);\r
+\r
+               printf_P(PSTR("\r\n\r\n"));\r
+               \r
+               LEDs_SetAllLEDs(LEDMASK_USB_READY);\r
+       }\r
+}\r
+\r
 /** Configures the board hardware and chip peripherals for the demo's functionality. */\r
 void SetupHardware(void)\r
 {\r