void *hdl;
// TODO: Sanity check (and check that Type is valid)
struct sDeviceRequest req;
+ int dest = Addr * 16 + EndPt; // TODO: Validate
+
+ ENTER("pHost xdest iType iReq iVal iIndx iLen pData",
+ Host, dest, Type, Req, Val, Indx, Len, Data);
+
req.ReqType = Type;
req.Request = Req;
req.Value = LittleEndian16( Val );
req.Index = LittleEndian16( Indx );
req.Length = LittleEndian16( Len );
-
- hdl = Host->HostDef->SendSETUP(Host->Ptr, Addr, EndPt, 0, NULL, NULL, &req, sizeof(req));
+
+ LOG("SETUP");
+ hdl = Host->HostDef->SendSETUP(Host->Ptr, dest, 0, NULL, NULL, &req, sizeof(req));
// TODO: Data toggle?
// TODO: Multi-packet transfers
- if( Type & 0x80 )
+ if( Len > 0 )
{
- void *hdl2;
-
- hdl = Host->HostDef->SendIN(Host->Ptr, Addr, EndPt, 0, NULL, NULL, Data, Len);
-
- hdl2 = Host->HostDef->SendOUT(Host->Ptr, Addr, EndPt, 0, NULL, NULL, NULL, 0);
- while( Host->HostDef->IsOpComplete(Host->Ptr, hdl2) == 0 )
- Time_Delay(1);
+ if( Type & 0x80 )
+ {
+ LOG("IN");
+ hdl = Host->HostDef->SendIN(Host->Ptr, dest, 1, NULL, NULL, Data, Len);
+
+ LOG("OUT (Status)");
+ hdl = Host->HostDef->SendOUT(Host->Ptr, dest, 1, INVLPTR, NULL, NULL, 0);
+ }
+ else
+ {
+ LOG("OUT");
+ Host->HostDef->SendOUT(Host->Ptr, dest, 1, NULL, NULL, Data, Len);
+
+ // Status phase (DataToggle=1)
+ LOG("IN (Status)");
+ hdl = Host->HostDef->SendIN(Host->Ptr, dest, 1, INVLPTR, NULL, NULL, 0);
+ }
}
else
{
- void *hdl2;
-
- if( Len > 0 )
- hdl = Host->HostDef->SendOUT(Host->Ptr, Addr, EndPt, 0, NULL, NULL, Data, Len);
- else
- hdl = NULL;
-
- // Status phase (DataToggle=1)
- hdl2 = Host->HostDef->SendIN(Host->Ptr, Addr, EndPt, 1, NULL, NULL, NULL, 0);
- while( Host->HostDef->IsOpComplete(Host->Ptr, hdl2) == 0 )
- Time_Delay(1);
+ // Zero length, IN status
+ LOG("IN (Status)");
+ hdl = Host->HostDef->SendIN(Host->Ptr, dest, 1, INVLPTR, NULL, NULL, 0);
}
+ LOG("Wait...");
+ while( Host->HostDef->IsOpComplete(Host->Ptr, hdl) == 0 )
+ Time_Delay(1);
+ LEAVE('p', hdl);
return hdl;
}
struct sDeviceRequest req;
int bToggle = 0;
void *final;
+ int dest = Dev->Address*16 + Endpoint;
+
+ ENTER("pDev xdest iType iIndex iLength pDest",
+ Dev, dest, Type, Index, Length, Dest);
req.ReqType = 0x80;
- switch( Type & 0xF00 )
- {
- case 0x000: req.ReqType |= (0 << 5); break; // Standard
- case 0x100: req.ReqType |= (1 << 5); break; // Class
- case 0x200: req.ReqType |= (2 << 5); break; // Vendor
- }
+ req.ReqType |= ((Type >> 8) & 0x3) << 5; // Bits 5/6
+ req.ReqType |= (Type >> 12) & 3; // Destination (Device, Interface, Endpoint, Other);
req.Request = 6; // GET_DESCRIPTOR
req.Value = LittleEndian16( ((Type & 0xFF) << 8) | (Index & 0xFF) );
- req.Index = LittleEndian16( 0 ); // TODO: Language ID
+ req.Index = LittleEndian16( 0 ); // TODO: Language ID / Interface
req.Length = LittleEndian16( Length );
-
+
+ LOG("SETUP");
Dev->Host->HostDef->SendSETUP(
- Dev->Host->Ptr, Dev->Address, Endpoint,
+ Dev->Host->Ptr, dest,
0, NULL, NULL,
&req, sizeof(req)
);
bToggle = 1;
while( Length > ciMaxPacketSize )
{
+ LOG("IN (%i rem)", Length - ciMaxPacketSize);
Dev->Host->HostDef->SendIN(
- Dev->Host->Ptr, Dev->Address, Endpoint,
+ Dev->Host->Ptr, dest,
bToggle, NULL, NULL,
Dest, ciMaxPacketSize
);
Length -= ciMaxPacketSize;
}
- final = Dev->Host->HostDef->SendIN(
- Dev->Host->Ptr, Dev->Address, Endpoint,
- bToggle, INVLPTR, NULL,
+ LOG("IN (final)");
+ Dev->Host->HostDef->SendIN(
+ Dev->Host->Ptr, dest,
+ bToggle, NULL, NULL,
Dest, Length
);
+ LOG("OUT (Status)");
+ final = Dev->Host->HostDef->SendOUT(Dev->Host->Ptr, dest, 1, INVLPTR, NULL, NULL, 0);
+
+ LOG("Waiting");
while( Dev->Host->HostDef->IsOpComplete(Dev->Host->Ptr, final) == 0 )
- Threads_Yield();
+ Threads_Yield(); // BAD BAD BAD
+ LEAVE('i', 0);
return 0;
}