Simplify the internal serial extraction routines for each architecture.

[pub/USBasp.git] / Demos / Host / LowLevel / RNDISEthernetHost / RNDISEthernetHost.c

diff --git a/Demos/Host/LowLevel/RNDISEthernetHost/RNDISEthernetHost.c b/Demos/Host/LowLevel/RNDISEthernetHost/RNDISEthernetHost.c
index 10d1158..8e86f1b 100644 (file)
--- a/Demos/Host/LowLevel/RNDISEthernetHost/RNDISEthernetHost.c
+++ b/Demos/Host/LowLevel/RNDISEthernetHost/RNDISEthernetHost.c
@@ -66,9 +66,12 @@ void SetupHardware(void)
        clock_prescale_set(clock_div_1);
 
        /* Hardware Initialization */
        clock_prescale_set(clock_div_1);
 
        /* Hardware Initialization */

-       SerialStream_Init(9600, false);
+       Serial_Init(9600, false);

        LEDs_Init();
        USB_Init();
        LEDs_Init();
        USB_Init();

+
+       /* Create a stdio stream for the serial port for stdin and stdout */
+       Serial_CreateStream(NULL);

 }
 
 /** Event handler for the USB_DeviceAttached event. This indicates that a device has been attached to the host, and
 }
 
 /** Event handler for the USB_DeviceAttached event. This indicates that a device has been attached to the host, and


@@ -100,7 +103,7 @@ void EVENT_USB_Host_DeviceEnumerationComplete(void)
 /** Event handler for the USB_HostError event. This indicates that a hardware error occurred while in host mode. */
 void EVENT_USB_Host_HostError(const uint8_t ErrorCode)
 {
 /** Event handler for the USB_HostError event. This indicates that a hardware error occurred while in host mode. */
 void EVENT_USB_Host_HostError(const uint8_t ErrorCode)
 {

-       USB_ShutDown();
+       USB_Disable();

 
        printf_P(PSTR(ESC_FG_RED "Host Mode Error\r\n"
                                 " -- Error Code %d\r\n" ESC_FG_WHITE), ErrorCode);
 
        printf_P(PSTR(ESC_FG_RED "Host Mode Error\r\n"
                                 " -- Error Code %d\r\n" ESC_FG_WHITE), ErrorCode);


@@ -147,13 +150,13 @@ void PrintIncomingPackets(void)
        if (PacketLength > 1024)
        {
                puts_P(PSTR(ESC_FG_RED "Packet too large.\r\n" ESC_FG_WHITE));
        if (PacketLength > 1024)
        {
                puts_P(PSTR(ESC_FG_RED "Packet too large.\r\n" ESC_FG_WHITE));

-               Pipe_Discard_Stream(PacketLength);
+               Pipe_Discard_Stream(PacketLength, NULL);

        }
        else
        {
                uint8_t PacketBuffer[PacketLength];
 
        }
        else
        {
                uint8_t PacketBuffer[PacketLength];
 

-               Pipe_Read_Stream_LE(&PacketBuffer, PacketLength);
+               Pipe_Read_Stream_LE(&PacketBuffer, PacketLength, NULL);

 
                for (uint16_t i = 0; i < PacketLength; i++)
                  printf("0x%02x ", PacketBuffer[i]);
 
                for (uint16_t i = 0; i < PacketLength; i++)
                  printf("0x%02x ", PacketBuffer[i]);