// TODO: Detect other forms of failure than "out of slots"
break ;
}
+ }
- // TODO: Register with the USB stack
+ for( int i = 0; Arguments[i]; i ++ )
+ {
+ char *pos = Arguments[i], *next;
+ LOG("pos = '%s'", pos);
+ tPAddr base = strtoull(pos, &next, 16);
+ if( base == 0 )
+ continue;
+ pos = next;
+ LOG("pos = '%s'", pos);
+ if( *pos++ != '-' )
+ continue;
+ LOG("pos = '%s'", pos);
+ int irq = strtol(pos, &next, 16);
+ if( irq == 0 )
+ continue ;
+ if( *next != 0 )
+ continue;
+ LOG("base=%x, irq=%i", base, irq);
+ if( EHCI_InitController(base, irq) )
+ {
+ continue ;
+ }
}
+
return 0;
}
}
// TODO: Error check
if( (cont->CapRegs->CapLength & 3) ) {
- Log_Warning("EHCI", "Controller at %P non-aligned op regs", BaseAddress);
+ Log_Warning("EHCI", "Controller at %P non-aligned op regs (%x)",
+ BaseAddress, cont->CapRegs->CapLength);
goto _error;
}
cont->OpRegs = (void*)( (Uint32*)cont->CapRegs + cont->CapRegs->CapLength / 4 );
Log_Warning("ECHI", "Can't allocate 1 32-bit page for periodic queue");
goto _error;
}
+ for( int i = 0; i < 1024; i ++ )
+ cont->PeriodicQueue[i] = 1;
// TODO: Error check
// > Populate queue
// - Route all ports
cont->OpRegs->ConfigFlag = 1;
+ cont->DeadTD = EHCI_int_AllocateTD(cont, 0, NULL, 0, NULL, NULL);
+ cont->DeadTD->Link = 1;
+ cont->DeadTD->Link2 = 1;
+ cont->DeadTD->Token = 0;
+
// -- Register with USB Core --
cont->RootHub = USB_RegisterHost(&gEHCI_HostDef, cont, cont->nPorts);
if( Period > 256 )
Period = 256;
+ LOG("Endpoint=%x, bOutbound=%i, Period=%i, Length=%i", Endpoint, bOutbound, Period, Length);
+
// Round the period to the closest power of two
pow2period = 1;
period_pow = 0;
// Allocate a QH
tEHCI_QH *qh = EHCI_int_AllocateQH(Cont, Endpoint, MaxPacketSize);
+ qh->CurrentTD = MM_GetPhysAddr(Cont->DeadTD);
// Append to async list
if( Cont->LastAsyncHead ) {
Cont->LastAsyncHead->HLink = MM_GetPhysAddr(qh)|2;
Cont->LastAsyncHead->Impl.Next = qh;
+ LOG("- Placed after %p", Cont->LastAsyncHead);
}
- else
+ else {
Cont->OpRegs->AsyncListAddr = MM_GetPhysAddr(qh)|2;
+ }
+ qh->HLink = Cont->OpRegs->AsyncListAddr;
+ Cont->OpRegs->USBCmd |= USBCMD_AsyncEnable;
Cont->LastAsyncHead = qh;
LOG("Created %p for %p Ep 0x%x - %i bytes MPS", qh, Ptr, Endpoint, MaxPacketSize);
if( (tVAddr)Dest <= 256*16 )
return NULL;
+ LOG("Dest=%p, isOutbound=%i, Lengths(Setup:%i,Out:%i,In:%i)", Dest, isOutbound, SetupLength, OutLength, InLength);
+
// Check size of SETUP and status
// Allocate TDs
{
td_data = InData ? EHCI_int_AllocateTD(Cont, PID_IN, InData, InLength, NULL, NULL) : NULL;
td_status = EHCI_int_AllocateTD(Cont, PID_OUT, (void*)OutData, OutLength, Cb, CbData);
- td_status->Token |= (1 << 15);
+ td_status->Token |= (1 << 15); // IOC
}
// Append TDs
if( td_data ) {
td_setup->Link = MM_GetPhysAddr(td_data);
td_data->Link = MM_GetPhysAddr(td_status) | 1;
+ td_data->Token |= (1 << 8); // Active
}
else {
td_setup->Link = MM_GetPhysAddr(td_status) | 1;
}
+ td_setup->Token |= (1 << 8); // Active
+ td_status->Token |= (1 << 8);
EHCI_int_AppendTD(Cont, Dest, td_setup);
return td_status;
// TODO: Figure out how to follow this properly
if( !ptd ) {
QH->CurrentTD = MM_GetPhysAddr(TD);
+ LOG("Appended %p to beginning of %p", TD, QH);
}
- else
+ else {
ptd->Link = MM_GetPhysAddr(TD);
+ LOG("Appended %p to end of %p", TD, QH);
+ }
}
tEHCI_QH *EHCI_int_AllocateQH(tEHCI_Controller *Cont, int Endpoint, size_t MaxPacketSize)
ret = &Cont->QHPools[i/QH_POOL_NPERPAGE][i%QH_POOL_NPERPAGE];
if( ret->HLink == 0 ) {
ret->HLink = 1;
- ret->CurrentTD = 0;
ret->Overlay.Link = 1;
- ret->Endpoint = (Endpoint >> 4) | ((Endpoint & 0xF) << 8)
+ ret->Endpoint = (Endpoint >> 4) | 0x80 | ((Endpoint & 0xF) << 8)
| (MaxPacketSize << 16);
// TODO: Endpoint speed (13:12) 0:Full, 1:Low, 2:High
// TODO: Control Endpoint Flag (27) 0:*, 1:Full/Low Control