char *TransmitBuffers[4];
tPAddr PhysTransmitBuffers[4];
- BOOL TransmitInUse; // Flags for each transmit descriptor
- int CurTXDecscriptor;
+ tMutex TransmitInUse[4];
+ tMutex CurTXProtector; //!< Protects \a .CurTXDescriptor
+ int CurTXDescriptor;
char Name[2];
tVFS_Node Node;
Uint16 base;
tCard *card;
- giRTL8139_CardCount = PCI_CountDevices(VENDOR_ID, DEVICE_ID, 0);
+ giRTL8139_CardCount = PCI_CountDevices(VENDOR_ID, DEVICE_ID);
Log_Debug("RTL8139", "%i cards", giRTL8139_CardCount);
if( giRTL8139_CardCount == 0 ) return MODULE_ERR_NOTNEEDED;
gaRTL8139_Cards = calloc( giRTL8139_CardCount, sizeof(tCard) );
//while( (id = PCI_GetDevice(0x10EC, 0x8139, 0, id)) != -1 )
- while( (id = PCI_GetDevice(VENDOR_ID, DEVICE_ID, 0, i)) != -1 )
+ while( (id = PCI_GetDevice(VENDOR_ID, DEVICE_ID, i)) != -1 )
{
card = &gaRTL8139_Cards[i];
- base = PCI_AssignPort( id, 0, 0x100 );
+ base = PCI_GetBAR( id, 0 );
+ if( !(base & 1) ) {
+ Log_Warning("RTL8139", "Driver does not support MMIO, skipping card");
+ card->IOBase = 0;
+ card->IRQ = 0;
+ continue ;
+ }
+ base &= ~1;
card->IOBase = base;
card->IRQ = PCI_GetIRQ( id );
ENTER("pNode XOffset XLength pBuffer", Node, Offset, Length, Buffer);
retry:
- Semaphore_Wait( &card->ReadSemaphore, 1 );
+ if( Semaphore_Wait( &card->ReadSemaphore, 1 ) != 1 )
+ {
+ LEAVE_RET('i', 0);
+ }
Mutex_Acquire( &card->ReadMutex );
ENTER("pNode XLength pBuffer", Node, Length, Buffer);
// TODO: Implement a semaphore for avaliable transmit buffers
-
- td = card->CurTXDecscriptor;
-
+
// Find an avaliable descriptor
- while( card->TransmitInUse & (1 << td) )
- Threads_Yield();
+ Mutex_Acquire(&card->CurTXProtector);
+ td = card->CurTXDescriptor;
+ card->CurTXDescriptor ++;
+ card->CurTXDescriptor %= 4;
+ Mutex_Release(&card->CurTXProtector);
+ // - Lock it
+ Mutex_Acquire( &card->TransmitInUse[td] );
LOG("td = %i", td);
// Transmit using descriptor `td`
- card->TransmitInUse |= (1 << td);
+ LOG("card->PhysTransmitBuffers[td] = %P", card->PhysTransmitBuffers[td]);
outd(card->IOBase + TSAD0 + td*4, card->PhysTransmitBuffers[td]);
- LOG("card->PhysTransmitBuffers[td] = 0x%llx", card->PhysTransmitBuffers[td]);
+ LOG("card->TransmitBuffers[td] = %p", card->TransmitBuffers[td]);
// Copy to buffer
memcpy(card->TransmitBuffers[td], Buffer, Length);
// Start
LOG("status = 0x%08x", status);
outd(card->IOBase + TSD0 + td*4, status);
- card->CurTXDecscriptor ++;
- card->CurTXDecscriptor %= 4;
-
LEAVE('i', (int)Length);
return Length;
int i, j;
tCard *card;
Uint16 status;
+
+ LOG("Num = %i", Num);
for( i = 0; i < giRTL8139_CardCount; i ++ )
{
for( j = 0; j < 4; j ++ )
{
if( ind(card->IOBase + TSD0 + j*4) & 0x8000 ) { // TSD TOK
- card->TransmitInUse &= ~(1 << j);
+ Mutex_Release( &card->TransmitInUse[j] );
// TODO: Update semaphore once implemented
}
}
LOG("packet_count = %i, read_ofs = 0x%x", packet_count, read_ofs);
- Semaphore_Signal( &card->ReadSemaphore, packet_count );
if( packet_count )
+ {
+ if( Semaphore_Signal( &card->ReadSemaphore, packet_count ) != packet_count ) {
+ // Oops?
+ }
VFS_MarkAvaliable( &card->Node, 1 );
+ }
outw(card->IOBase + ISR, FLAG_ISR_ROK);
}