Ensure that USB_DEVICE_ONLY or USB_HOST_ONLY is properly set for devices that physica...

[pub/USBasp.git] / Demos / Device / LowLevel / RNDISEthernet / RNDISEthernet.h

diff --git a/Demos/Device/LowLevel/RNDISEthernet/RNDISEthernet.h b/Demos/Device/LowLevel/RNDISEthernet/RNDISEthernet.h
index 0caf953..155544c 100644 (file)
--- a/Demos/Device/LowLevel/RNDISEthernet/RNDISEthernet.h
+++ b/Demos/Device/LowLevel/RNDISEthernet/RNDISEthernet.h
@@ -1,21 +1,21 @@
 /*
              LUFA Library
 /*
              LUFA Library

-     Copyright (C) Dean Camera, 2010.
-              
+     Copyright (C) Dean Camera, 2012.
+

   dean [at] fourwalledcubicle [dot] com
   dean [at] fourwalledcubicle [dot] com

-      www.fourwalledcubicle.com
+           www.lufa-lib.org

 */
 
 /*
 */
 
 /*

-  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2012  Dean Camera (dean [at] fourwalledcubicle [dot] com)

 
 

-  Permission to use, copy, modify, distribute, and sell this 
+  Permission to use, copy, modify, distribute, and sell this

   software and its documentation for any purpose is hereby granted
   software and its documentation for any purpose is hereby granted

-  without fee, provided that the above copyright notice appear in 
+  without fee, provided that the above copyright notice appear in

   all copies and that both that the copyright notice and this
   all copies and that both that the copyright notice and this

-  permission notice and warranty disclaimer appear in supporting 
-  documentation, and that the name of the author not be used in 
-  advertising or publicity pertaining to distribution of the 
+  permission notice and warranty disclaimer appear in supporting
+  documentation, and that the name of the author not be used in
+  advertising or publicity pertaining to distribution of the

   software without specific, written prior permission.
 
   The author disclaim all warranties with regard to this
   software without specific, written prior permission.
 
   The author disclaim all warranties with regard to this


@@ -32,7 +32,7 @@
  *
  *  Header file for RNDISEthernet.c.
  */
  *
  *  Header file for RNDISEthernet.c.
  */

- 
+

 #ifndef _RNDISETHERNET_H_
 #define _RNDISETHERNET_H_
 
 #ifndef _RNDISETHERNET_H_
 #define _RNDISETHERNET_H_
 


@@ -50,12 +50,12 @@
                #include "Lib/TCP.h"
                #include "Lib/ARP.h"
                #include "Lib/Webserver.h"
                #include "Lib/TCP.h"
                #include "Lib/ARP.h"
                #include "Lib/Webserver.h"

-
-               #include <LUFA/Version.h>
+               #include "Config/AppConfig.h"
+               

                #include <LUFA/Drivers/USB/USB.h>
                #include <LUFA/Drivers/Board/LEDs.h>
                #include <LUFA/Drivers/USB/USB.h>
                #include <LUFA/Drivers/Board/LEDs.h>

-               #include <LUFA/Drivers/Peripheral/SerialStream.h>
-       
+               #include <LUFA/Drivers/Peripheral/Serial.h>
+

        /* Macros: */
                /** Notification value to indicate that a frame is ready to be read by the host. */
                #define NOTIF_RESPONSE_AVAILABLE  0x01
        /* Macros: */
                /** Notification value to indicate that a frame is ready to be read by the host. */
                #define NOTIF_RESPONSE_AVAILABLE  0x01


@@ -74,20 +74,7 @@
 
                /** LED mask for the library LED driver, to indicate that the USB interface is busy. */
                #define LEDMASK_USB_BUSY          LEDS_LED2
 
                /** LED mask for the library LED driver, to indicate that the USB interface is busy. */
                #define LEDMASK_USB_BUSY          LEDS_LED2

-               
-       /* Type Defines: */
-               /** Type define for a RNDIS notification message, for transmission to the RNDIS host via the notification
-                *  Endpoint.
-                */
-               typedef struct
-               {
-                       uint8_t  bmRequestType; /**< Notification type, a mask of values from SrdRequestType.h */
-                       uint8_t  bNotification; /**< Notification index, indicating what the RNDIS notification relates to */
-                       uint16_t wValue; /**< Two byte notification value parameter */
-                       uint16_t wIndex; /**< Two byte notification index parameter */
-                       uint16_t wLength; /**< Size of data payload following the notification header */
-               } USB_Notification_t;
-               
+

        /* Function Prototypes: */
                void SetupHardware(void);
                void RNDIS_Task(void);
        /* Function Prototypes: */
                void SetupHardware(void);
                void RNDIS_Task(void);


@@ -96,6 +83,7 @@
                void EVENT_USB_Device_Connect(void);
                void EVENT_USB_Device_Disconnect(void);
                void EVENT_USB_Device_ConfigurationChanged(void);
                void EVENT_USB_Device_Connect(void);
                void EVENT_USB_Device_Disconnect(void);
                void EVENT_USB_Device_ConfigurationChanged(void);

-               void EVENT_USB_Device_UnhandledControlRequest(void);
-       
+               void EVENT_USB_Device_ControlRequest(void);
+

 #endif
 #endif

+