Modules/USB Core - Implemented _SendData and _RecvData
[tpg/acess2.git] / KernelLand / Modules / USB / Core / usb_io.c
index 25ff59d..992269a 100644 (file)
 #include "usb.h"
 #include "usb_lowlevel.h"
 #include <workqueue.h>
-
-typedef struct sAsyncOp        tAsyncOp;
-
-struct sAsyncOp
-{
-       tAsyncOp        *Next;
-       tUSBEndpoint    *Endpt;
-        int    Length;
-       void    *Data;
-};
+#include <events.h>
+#include "usb_async.h"
 
 // === PROTOTYPES ===
 void   USB_ReadDescriptor(tUSBInterface *Iface, int Type, int Index, int Length, void *Data);
 void   USB_Request(tUSBInterface *Iface, int Endpoint, int Type, int Req, int Value, int Index, int Len, void *Data);
-void   USB_AsyncCallback(void *Ptr, void *Buf, int Length);
+void   USB_SendData(tUSBInterface *Dev, int Endpoint, size_t Length, const void *Data);
+void   USB_WakeCallback(void *Ptr, void *Buf, size_t Length);
+void   USB_AsyncCallback(void *Ptr, void *Buf, size_t Length);
 void   USB_AsyncThread(void *unused);
 
 // === GLOBALS ===
@@ -55,14 +49,54 @@ void USB_Request(tUSBInterface *Iface, int Endpoint, int Type, int Req, int Valu
 }
 
 
-void USB_SendData(tUSBInterface *Dev, int Endpoint, int Length, void *Data)
+void USB_SendData(tUSBInterface *Dev, int Endpoint, size_t Length, const void *Data)
 {
-       Log_Warning("USB", "TODO: Implement USB_SendData");
+       tUSBHost *host;
+       tUSBEndpoint    *ep;
+       ENTER("pDev iEndpoint iLength pData", Dev, Endpoint, Length, Data);
+
+       ep = &Dev->Endpoints[Endpoint-1];
+       host = Dev->Dev->Host;
+
+       if( Length > ep->MaxPacketSize ) {
+               Log_Warning("USB", "Max packet size exceeded (%i > %i)", ep->MaxPacketSize);
+               LEAVE('-');
+       }
+
+       Threads_ClearEvent(THREAD_EVENT_SHORTWAIT);
+       host->HostDef->BulkOUT(
+               host->Ptr, Dev->Dev->Address*16 + Dev->Endpoints[Endpoint-1].EndpointNum,
+               0, USB_WakeCallback, Proc_GetCurThread(),
+               (void*)Data, Length
+               );
+       Threads_WaitEvents(THREAD_EVENT_SHORTWAIT);
+       
+       LEAVE('-');
 }
 
-void USB_RecvData(tUSBInterface *Dev, int Endpoint, int Length, void *Data)
+void USB_RecvData(tUSBInterface *Dev, int Endpoint, size_t Length, void *Data)
 {
-       Log_Warning("USB", "TODO: Implement USB_RecvData");
+       tUSBHost *host;
+       tUSBEndpoint    *ep;
+       ENTER("pDev iEndpoint iLength pData", Dev, Endpoint, Length, Data);
+
+       ep = &Dev->Endpoints[Endpoint-1];
+       host = Dev->Dev->Host;
+
+       if( Length > ep->MaxPacketSize ) {
+               Log_Warning("USB", "Max packet size exceeded (%i > %i)", ep->MaxPacketSize);
+               LEAVE('-');
+       }
+
+       Threads_ClearEvent(THREAD_EVENT_SHORTWAIT);
+       host->HostDef->BulkIN(
+               host->Ptr, Dev->Dev->Address*16 + Dev->Endpoints[Endpoint-1].EndpointNum,
+               0, USB_WakeCallback, Proc_GetCurThread(),
+               Data, Length
+               );
+       Threads_WaitEvents(THREAD_EVENT_SHORTWAIT);
+       
+       LEAVE('-');
 }
 
 void USB_RecvDataA(tUSBInterface *Dev, int Endpoint, int Length, void *DataBuf, tUSB_DataCallback Callback)
@@ -79,11 +113,12 @@ void USB_RecvDataA(tUSBInterface *Dev, int Endpoint, int Length, void *DataBuf,
        op->Data = DataBuf;
 
        // TODO: Handle transfers that are larger than one packet
+       // TODO: Data toggle
 
        host = Dev->Dev->Host;
        LOG("IN from %p %i:%i", host->Ptr, Dev->Dev->Address, op->Endpt->EndpointNum);
-       host->HostDef->SendIN(
-               host->Ptr, Dev->Dev->Address, op->Endpt->EndpointNum,
+       host->HostDef->BulkIN(
+               host->Ptr, Dev->Dev->Address*16 + op->Endpt->EndpointNum,
                0, USB_AsyncCallback, op,
                DataBuf, Length
                );
@@ -93,7 +128,12 @@ void USB_RecvDataA(tUSBInterface *Dev, int Endpoint, int Length, void *DataBuf,
 //     Log_Warning("USB", "TODO: Implement USB_RecvDataA");
 }
 
-void USB_AsyncCallback(void *Ptr, void *Buf, int Length)
+void USB_WakeCallback(void *Ptr, void *Buf, size_t Length)
+{
+       Threads_PostEvent(Ptr, THREAD_EVENT_SHORTWAIT);
+}
+
+void USB_AsyncCallback(void *Ptr, void *Buf, size_t Length)
 {
        tAsyncOp *op = Ptr;
        op->Length = Length;
@@ -114,6 +154,8 @@ void USB_AsyncThread(void *Unused)
                iface->Driver->Endpoints[op->Endpt->EndpointIdx].DataAvail(
                        iface, op->Endpt->EndpointIdx,
                        op->Length, op->Data);
+               
+               free(op);
        }
 }
 

UCC git Repository :: git.ucc.asn.au