*/
 
 /*
-  Copyright 2011  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
   software and its documentation for any purpose is hereby granted
 {
        SideShow_PacketHeader_t PacketHeader;
 
-       Endpoint_SelectEndpoint(SIDESHOW_OUT_EPNUM);
+       Endpoint_SelectEndpoint(SIDESHOW_OUT_EPADDR);
        Endpoint_Read_Stream_LE(&PacketHeader, sizeof(SideShow_PacketHeader_t), NULL);
 
        PacketHeader.Type.TypeFields.Response = true;
                        PacketHeader.Length   = sizeof(SideShow_PacketHeader_t);
                        PacketHeader.Type.TypeFields.NAK = true;
 
-                       Endpoint_SelectEndpoint(SIDESHOW_IN_EPNUM);
+                       Endpoint_SelectEndpoint(SIDESHOW_IN_EPADDR);
                        Endpoint_Write_Stream_LE(&PacketHeader, sizeof(SideShow_PacketHeader_t), NULL);
                        Endpoint_ClearIN();
 
 {
        Endpoint_ClearOUT();
 
-       Endpoint_SelectEndpoint(SIDESHOW_IN_EPNUM);
+       Endpoint_SelectEndpoint(SIDESHOW_IN_EPADDR);
        Endpoint_Write_Stream_LE(PacketHeader, sizeof(SideShow_PacketHeader_t), NULL);
        Endpoint_ClearIN();
 }
        if (!(GUID_COMPARE(&ProtocolGUID, (uint32_t[])STANDARD_PROTOCOL_GUID)))
          PacketHeader->Type.TypeFields.NAK = true;
 
-       Endpoint_SelectEndpoint(SIDESHOW_IN_EPNUM);
+       Endpoint_SelectEndpoint(SIDESHOW_IN_EPADDR);
        Endpoint_Write_Stream_LE(PacketHeader, sizeof(SideShow_PacketHeader_t), NULL);
        Endpoint_Write_Stream_LE(&ProtocolGUID, sizeof(GUID_t), NULL);
        Endpoint_ClearIN();
 
        PacketHeader->Length = sizeof(SideShow_PacketHeader_t) + sizeof(uint32_t) + UserSID.LengthInBytes;
 
-       Endpoint_SelectEndpoint(SIDESHOW_IN_EPNUM);
+       Endpoint_SelectEndpoint(SIDESHOW_IN_EPADDR);
        Endpoint_Write_Stream_LE(PacketHeader, sizeof(SideShow_PacketHeader_t), NULL);
        SideShow_Write_Unicode_String(&UserSID);
        Endpoint_ClearIN();
 
        PacketHeader->Length = sizeof(SideShow_PacketHeader_t);
 
-       Endpoint_SelectEndpoint(SIDESHOW_IN_EPNUM);
+       Endpoint_SelectEndpoint(SIDESHOW_IN_EPADDR);
        Endpoint_Write_Stream_LE(PacketHeader, sizeof(SideShow_PacketHeader_t), NULL);
        Endpoint_ClearIN();
 }
                                           Property.PropertyGUID.Chunks[2],  Property.PropertyGUID.Chunks[3]);
        }
 
-       Endpoint_SelectEndpoint(SIDESHOW_IN_EPNUM);
+       Endpoint_SelectEndpoint(SIDESHOW_IN_EPADDR);
        Endpoint_Write_Stream_LE(PacketHeader, sizeof(SideShow_PacketHeader_t), NULL);
 
        if (!(PacketHeader->Type.TypeFields.NAK))
        PacketHeader->Length = sizeof(SideShow_PacketHeader_t) +
                               sizeof(uint32_t) + ((Unicode_String_t*)UnicodeStruct)->LengthInBytes;
 
-       Endpoint_SelectEndpoint(SIDESHOW_IN_EPNUM);
+       Endpoint_SelectEndpoint(SIDESHOW_IN_EPADDR);
        Endpoint_Write_Stream_LE(PacketHeader, sizeof(SideShow_PacketHeader_t), NULL);
        SideShow_Write_Unicode_String(UnicodeStruct);
        Endpoint_ClearIN();
        PacketHeader->Length = sizeof(SideShow_PacketHeader_t) +
                               sizeof(uint32_t) + (TotalApplications * sizeof(GUID_t));
 
-       Endpoint_SelectEndpoint(SIDESHOW_IN_EPNUM);
+       Endpoint_SelectEndpoint(SIDESHOW_IN_EPADDR);
        Endpoint_Write_Stream_LE(PacketHeader, sizeof(SideShow_PacketHeader_t), NULL);
        Endpoint_Write_32_LE(TotalApplications);
 
 
        PacketHeader->Length = sizeof(SideShow_PacketHeader_t) + sizeof(uint32_t) + sizeof(GUID_t);
 
-       Endpoint_SelectEndpoint(SIDESHOW_IN_EPNUM);
+       Endpoint_SelectEndpoint(SIDESHOW_IN_EPADDR);
        Endpoint_Write_Stream_LE(PacketHeader, sizeof(SideShow_PacketHeader_t), NULL);
        Endpoint_Write_32_LE(1);
        Endpoint_Write_Stream_LE(&SupportedEndpointGUID, sizeof(GUID_t), NULL);
 
        PacketHeader->Length = sizeof(SideShow_PacketHeader_t);
 
-       Endpoint_SelectEndpoint(SIDESHOW_IN_EPNUM);
+       Endpoint_SelectEndpoint(SIDESHOW_IN_EPADDR);
        Endpoint_Write_Stream_LE(PacketHeader, sizeof(SideShow_PacketHeader_t), NULL);
        Endpoint_ClearIN();
 }
 
        PacketHeader->Length = sizeof(SideShow_PacketHeader_t);
 
-       Endpoint_SelectEndpoint(SIDESHOW_IN_EPNUM);
+       Endpoint_SelectEndpoint(SIDESHOW_IN_EPADDR);
        Endpoint_Write_Stream_LE(PacketHeader, sizeof(SideShow_PacketHeader_t), NULL);
        Endpoint_ClearIN();
 }
        for (uint8_t App = 0; App < MAX_APPLICATIONS; App++)
          InstalledApplications[App].InUse = false;
 
-       Endpoint_SelectEndpoint(SIDESHOW_IN_EPNUM);
+       Endpoint_SelectEndpoint(SIDESHOW_IN_EPADDR);
        Endpoint_Write_Stream_LE(PacketHeader, sizeof(SideShow_PacketHeader_t), NULL);
        Endpoint_ClearIN();
 }
 
        PacketHeader->Length = sizeof(SideShow_PacketHeader_t);
 
-       Endpoint_SelectEndpoint(SIDESHOW_IN_EPNUM);
+       Endpoint_SelectEndpoint(SIDESHOW_IN_EPADDR);
        Endpoint_Write_Stream_LE(PacketHeader, sizeof(SideShow_PacketHeader_t), NULL);
        Endpoint_ClearIN();
 }
 
        PacketHeader->Length = sizeof(SideShow_PacketHeader_t);
 
-       Endpoint_SelectEndpoint(SIDESHOW_IN_EPNUM);
+       Endpoint_SelectEndpoint(SIDESHOW_IN_EPADDR);
        Endpoint_Write_Stream_LE(PacketHeader, sizeof(SideShow_PacketHeader_t), NULL);
        Endpoint_ClearIN();
 }
 
        PacketHeader->Length = sizeof(SideShow_PacketHeader_t);
 
-       Endpoint_SelectEndpoint(SIDESHOW_IN_EPNUM);
+       Endpoint_SelectEndpoint(SIDESHOW_IN_EPADDR);
        Endpoint_Write_Stream_LE(PacketHeader, sizeof(SideShow_PacketHeader_t), NULL);
        Endpoint_ClearIN();
 }