git.ucc.asn.au
/
tpg
/
acess2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
RT8139 - Fixed to use Mutexes to control access to TXDescs
[tpg/acess2.git]
/
Modules
/
Network
/
RTL8139
/
rtl8139.c
diff --git
a/Modules/Network/RTL8139/rtl8139.c
b/Modules/Network/RTL8139/rtl8139.c
index
c2ec80a
..
af4ace7
100644
(file)
--- a/
Modules/Network/RTL8139/rtl8139.c
+++ b/
Modules/Network/RTL8139/rtl8139.c
@@
-80,8
+80,9
@@
typedef struct sCard
char *TransmitBuffers[4];
tPAddr PhysTransmitBuffers[4];
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;
char Name[2];
tVFS_Node Node;
@@
-137,6
+138,13
@@
int RTL8139_Install(char **Options)
{
card = &gaRTL8139_Cards[i];
base = PCI_GetBAR( id, 0 );
{
card = &gaRTL8139_Cards[i];
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 );
card->IOBase = base;
card->IRQ = PCI_GetIRQ( id );
@@
-306,19
+314,22
@@
Uint64 RTL8139_Write(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer
ENTER("pNode XLength pBuffer", Node, Length, Buffer);
// TODO: Implement a semaphore for avaliable transmit buffers
ENTER("pNode XLength pBuffer", Node, Length, Buffer);
// TODO: Implement a semaphore for avaliable transmit buffers
-
- td = card->CurTXDecscriptor;
-
+
// Find an avaliable descriptor
// 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`
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]);
outd(card->IOBase + TSAD0 + td*4, card->PhysTransmitBuffers[td]);
- LOG("card->
PhysTransmitBuffers[td] = 0x%llx", card->Phys
TransmitBuffers[td]);
+ LOG("card->
TransmitBuffers[td] = %p", card->
TransmitBuffers[td]);
// Copy to buffer
memcpy(card->TransmitBuffers[td], Buffer, Length);
// Start
// Copy to buffer
memcpy(card->TransmitBuffers[td], Buffer, Length);
// Start
@@
-329,9
+340,6
@@
Uint64 RTL8139_Write(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer
LOG("status = 0x%08x", status);
outd(card->IOBase + TSD0 + td*4, status);
LOG("status = 0x%08x", status);
outd(card->IOBase + TSD0 + td*4, status);
- card->CurTXDecscriptor ++;
- card->CurTXDecscriptor %= 4;
-
LEAVE('i', (int)Length);
return Length;
LEAVE('i', (int)Length);
return Length;
@@
-363,6
+371,8
@@
void RTL8139_IRQHandler(int Num)
int i, j;
tCard *card;
Uint16 status;
int i, j;
tCard *card;
Uint16 status;
+
+ LOG("Num = %i", Num);
for( i = 0; i < giRTL8139_CardCount; i ++ )
{
for( i = 0; i < giRTL8139_CardCount; i ++ )
{
@@
-378,7
+388,7
@@
void RTL8139_IRQHandler(int Num)
for( j = 0; j < 4; j ++ )
{
if( ind(card->IOBase + TSD0 + j*4) & 0x8000 ) { // TSD TOK
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
}
}
// TODO: Update semaphore once implemented
}
}
UCC
git Repository :: git.ucc.asn.au