The incomplete StandaloneProgrammer project now uses Host and Device Mass storage...

[pub/USBasp.git] / Demos / Host / Incomplete / RNDISEthernetHost / Lib / RNDISCommands.c

diff --git a/Demos/Host/Incomplete/RNDISEthernetHost/Lib/RNDISCommands.c b/Demos/Host/Incomplete/RNDISEthernetHost/Lib/RNDISCommands.c
index 6bacc8f..b196614 100644 (file)
--- a/Demos/Host/Incomplete/RNDISEthernetHost/Lib/RNDISCommands.c
+++ b/Demos/Host/Incomplete/RNDISEthernetHost/Lib/RNDISCommands.c
@@ -48,17 +48,6 @@ uint8_t RNDIS_SendEncapsulatedCommand(void* Buffer, uint16_t Length)
                        .wIndex        = 0,\r
                        .wLength       = Length,\r
                };\r
-       \r
-       printf("==== RNDIS CONTROL REQUEST ====\r\n");\r
-       uint8_t* Data = Buffer;\r
-       for (uint16_t i = 0; i < Length / 8; i++)\r
-       {\r
-               for (uint16_t j = 0; (j < 8) && i*8+j < Length; j++)\r
-                       printf("%02X ", *(Data++));\r
-                       \r
-               printf("\r\n");\r
-       }\r
-       printf("==== ********************* ====\r\n");\r
 \r
        /* Select the control pipe for the request transfer */\r
        Pipe_SelectPipe(PIPE_CONTROLPIPE);\r
@@ -83,18 +72,46 @@ uint8_t RNDIS_GetEncapsulatedResponse(void* Buffer, uint16_t Length)
        return USB_Host_SendControlRequest(Buffer);\r
 }\r
 \r
-uint8_t RNDIS_InitializeDevice(uint16_t MaxPacketSize, RNDIS_Initialize_Complete_t* InitMessageResponse)\r
+uint8_t RNDIS_SendKeepAlive(void)\r
 {\r
        uint8_t ErrorCode;\r
 \r
-       RNDIS_Initialize_Message_t InitMessage;\r
+       RNDIS_KeepAlive_Message_t  KeepAliveMessage;\r
+       RNDIS_KeepAlive_Complete_t KeepAliveMessageResponse;\r
+       \r
+       KeepAliveMessage.MessageType     = REMOTE_NDIS_KEEPALIVE_MSG;\r
+       KeepAliveMessage.MessageLength   = sizeof(RNDIS_KeepAlive_Message_t);\r
+       KeepAliveMessage.RequestId       = RequestID++;\r
+\r
+       if ((ErrorCode = RNDIS_SendEncapsulatedCommand(&KeepAliveMessage,\r
+                                                      sizeof(RNDIS_KeepAlive_Message_t))) != HOST_SENDCONTROL_Successful)\r
+       {\r
+               return ErrorCode;\r
+       }\r
+       \r
+       if ((ErrorCode = RNDIS_GetEncapsulatedResponse(&KeepAliveMessageResponse,\r
+                                                      sizeof(RNDIS_KeepAlive_Complete_t))) != HOST_SENDCONTROL_Successful)\r
+       {\r
+               return ErrorCode;\r
+       }\r
+       \r
+       return HOST_SENDCONTROL_Successful;\r
+}\r
+\r
+uint8_t RNDIS_InitializeDevice(uint16_t HostMaxPacketSize, uint16_t* DeviceMaxPacketSize)\r
+{\r
+       uint8_t ErrorCode;\r
+\r
+       RNDIS_Initialize_Message_t  InitMessage;\r
+       RNDIS_Initialize_Complete_t InitMessageResponse;\r
 \r
        InitMessage.MessageType     = REMOTE_NDIS_INITIALIZE_MSG;\r
        InitMessage.MessageLength   = sizeof(RNDIS_Initialize_Message_t);\r
        InitMessage.RequestId       = RequestID++;\r
+\r
        InitMessage.MajorVersion    = REMOTE_NDIS_VERSION_MAJOR;\r
        InitMessage.MinorVersion    = REMOTE_NDIS_VERSION_MINOR;\r
-       InitMessage.MaxTransferSize = sizeof(RNDIS_Packet_Message_t) + MaxPacketSize;\r
+       InitMessage.MaxTransferSize = HostMaxPacketSize;\r
        \r
        if ((ErrorCode = RNDIS_SendEncapsulatedCommand(&InitMessage,\r
                                                       sizeof(RNDIS_Initialize_Message_t))) != HOST_SENDCONTROL_Successful)\r
@@ -102,11 +119,16 @@ uint8_t RNDIS_InitializeDevice(uint16_t MaxPacketSize, RNDIS_Initialize_Complete
                return ErrorCode;\r
        }\r
        \r
-       if ((ErrorCode = RNDIS_GetEncapsulatedResponse(InitMessageResponse,\r
+       if ((ErrorCode = RNDIS_GetEncapsulatedResponse(&InitMessageResponse,\r
                                                       sizeof(RNDIS_Initialize_Complete_t))) != HOST_SENDCONTROL_Successful)\r
        {\r
                return ErrorCode;\r
        }\r
+\r
+       if (InitMessageResponse.Status != REMOTE_NDIS_STATUS_SUCCESS)\r
+         return RNDIS_COMMAND_FAILED;\r
+         \r
+       *DeviceMaxPacketSize = InitMessageResponse.MaxTransferSize;\r
        \r
        return HOST_SENDCONTROL_Successful;\r
 }\r
@@ -123,15 +145,16 @@ uint8_t RNDIS_SetRNDISProperty(uint32_t Oid, void* Buffer, uint16_t Length)
        \r
        RNDIS_Set_Complete_t SetMessageResponse;\r
        \r
-       SetMessageData.SetMessage.MessageType   = REMOTE_NDIS_SET_MSG;\r
-       SetMessageData.SetMessage.MessageLength = sizeof(RNDIS_Set_Message_t) + Length;\r
-       SetMessageData.SetMessage.RequestId     = RequestID++;\r
+       SetMessageData.SetMessage.MessageType    = REMOTE_NDIS_SET_MSG;\r
+       SetMessageData.SetMessage.MessageLength  = sizeof(RNDIS_Set_Message_t) + Length;\r
+       SetMessageData.SetMessage.RequestId      = RequestID++;\r
                        \r
-       SetMessageData.SetMessage.Oid           = Oid;\r
+       SetMessageData.SetMessage.Oid            = Oid;\r
        SetMessageData.SetMessage.InformationBufferLength = Length;\r
-       SetMessageData.SetMessage.InformationBufferOffset = 0;\r
+       SetMessageData.SetMessage.InformationBufferOffset = (sizeof(RNDIS_Set_Message_t) - sizeof(RNDIS_Message_Header_t));\r
        SetMessageData.SetMessage.DeviceVcHandle = 0;\r
-\r
+       \r
+       memcpy(&SetMessageData.ContigiousBuffer, Buffer, Length);\r
 \r
        if ((ErrorCode = RNDIS_SendEncapsulatedCommand(&SetMessageData,\r
                                                       SetMessageData.SetMessage.MessageLength)) != HOST_SENDCONTROL_Successful)\r
@@ -145,5 +168,67 @@ uint8_t RNDIS_SetRNDISProperty(uint32_t Oid, void* Buffer, uint16_t Length)
                return ErrorCode;\r
        }\r
 \r
+       if (SetMessageResponse.Status != REMOTE_NDIS_STATUS_SUCCESS)\r
+         return RNDIS_COMMAND_FAILED;\r
+         \r
+       return HOST_SENDCONTROL_Successful;\r
+}\r
+\r
+uint8_t RNDIS_QueryRNDISProperty(uint32_t Oid, void* Buffer, uint16_t MaxLength)\r
+{\r
+       uint8_t ErrorCode;\r
+\r
+       RNDIS_Query_Message_t QueryMessage;\r
+\r
+       struct\r
+       {\r
+               RNDIS_Query_Complete_t QueryMessageResponse;\r
+               uint8_t                ContigiousBuffer[MaxLength];\r
+       } QueryMessageResponseData;\r
+\r
+       QueryMessage.MessageType    = REMOTE_NDIS_QUERY_MSG;\r
+       QueryMessage.MessageLength  = sizeof(RNDIS_Query_Message_t);\r
+       QueryMessage.RequestId      = RequestID++;\r
+                       \r
+       QueryMessage.Oid            = Oid;\r
+       QueryMessage.InformationBufferLength = 0;\r
+       QueryMessage.InformationBufferOffset = 0;\r
+       QueryMessage.DeviceVcHandle = 0;\r
+\r
+       if ((ErrorCode = RNDIS_SendEncapsulatedCommand(&QueryMessage,\r
+                                                      sizeof(RNDIS_Query_Message_t))) != HOST_SENDCONTROL_Successful)\r
+       {\r
+               return ErrorCode;\r
+       }\r
+       \r
+       if ((ErrorCode = RNDIS_GetEncapsulatedResponse(&QueryMessageResponseData,\r
+                                                      sizeof(QueryMessageResponseData))) != HOST_SENDCONTROL_Successful)\r
+       {\r
+               return ErrorCode;\r
+       }\r
+\r
+       if (QueryMessageResponseData.QueryMessageResponse.Status != REMOTE_NDIS_STATUS_SUCCESS)\r
+         return RNDIS_COMMAND_FAILED;\r
+\r
+       memcpy(Buffer, &QueryMessageResponseData.ContigiousBuffer, MaxLength);\r
+\r
        return HOST_SENDCONTROL_Successful;\r
 }\r
+\r
+uint8_t RNDIS_GetPacketLength(uint16_t* PacketLength)\r
+{\r
+       uint8_t ErrorCode;\r
+\r
+       RNDIS_Packet_Message_t DeviceMessage;\r
+       \r
+       if ((ErrorCode = Pipe_Read_Stream_LE(&DeviceMessage, sizeof(RNDIS_Packet_Message_t))) != PIPE_RWSTREAM_NoError)\r
+       {\r
+               return ErrorCode;\r
+       }\r
+\r
+       *PacketLength = (uint16_t)DeviceMessage.DataLength;\r
+       \r
+       Pipe_Discard_Stream(DeviceMessage.DataOffset - (sizeof(RNDIS_Packet_Message_t) - sizeof(RNDIS_Message_Header_t)));\r
+       \r
+       return PIPE_RWSTREAM_NoError;\r
+}\r