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
Kernel/libc - Replace invalid '%C' strings with "(inval)"
[tpg/acess2.git]
/
KernelLand
/
Modules
/
Network
/
VIARhineII
/
rhine2.c
diff --git
a/KernelLand/Modules/Network/VIARhineII/rhine2.c
b/KernelLand/Modules/Network/VIARhineII/rhine2.c
index
be0e348
..
c933739
100644
(file)
--- a/
KernelLand/Modules/Network/VIARhineII/rhine2.c
+++ b/
KernelLand/Modules/Network/VIARhineII/rhine2.c
@@
-2,7
+2,7
@@
* Acess2 VIA Rhine II Driver (VT6102)
* - By John Hodge (thePowersGang)
*/
* Acess2 VIA Rhine II Driver (VT6102)
* - By John Hodge (thePowersGang)
*/
-#define DEBUG
1
+#define DEBUG
0
#define VERSION ((0<<8)|10)
#include <acess.h>
#include <modules.h>
#define VERSION ((0<<8)|10)
#include <acess.h>
#include <modules.h>
@@
-36,7
+36,7
@@
typedef struct sCard
struct {
Uint32 Phys;
void *Virt;
struct {
Uint32 Phys;
void *Virt;
- } RXBuffers[N_RX_PAGES];
+ } RXBuffers[N_RX_
BUF_
PAGES];
Uint32 DescTablePhys;
void *DescTable;
Uint32 DescTablePhys;
void *DescTable;
@@
-80,8
+80,6
@@
int Rhine2_Install(char **Options)
{
int id = -1;
int i = 0;
{
int id = -1;
int i = 0;
-// Uint16 base;
- tCard *card;
giRhine2_CardCount = PCI_CountDevices(VENDOR_ID, DEVICE_ID);
if( giRhine2_CardCount == 0 ) return MODULE_ERR_NOTNEEDED;
giRhine2_CardCount = PCI_CountDevices(VENDOR_ID, DEVICE_ID);
if( giRhine2_CardCount == 0 ) return MODULE_ERR_NOTNEEDED;
@@
-90,7
+88,7
@@
int Rhine2_Install(char **Options)
while( (id = PCI_GetDevice(VENDOR_ID, DEVICE_ID, i)) != -1 )
{
while( (id = PCI_GetDevice(VENDOR_ID, DEVICE_ID, i)) != -1 )
{
- card = &gaRhine2_Cards[i];
+
tCard *
card = &gaRhine2_Cards[i];
LOG("BAR0 = 0x%08x", PCI_GetBAR(id, 0));
LOG("BAR1 = 0x%08x", PCI_GetBAR(id, 1));
LOG("BAR0 = 0x%08x", PCI_GetBAR(id, 0));
LOG("BAR1 = 0x%08x", PCI_GetBAR(id, 1));
@@
-145,7
+143,7
@@
void Rhine2_int_InitialiseCard(tCard *Card)
LOG("Allocaating RX buffers");
// Allocate memory for things
LOG("Allocaating RX buffers");
// Allocate memory for things
- for( int i = 0; i < N_RX_PAGES; i ++ )
+ for( int i = 0; i < N_RX_
BUF_
PAGES; i ++ )
{
Card->RXBuffers[i].Virt = (void*)MM_AllocDMA(1, 32, &phys);
Card->RXBuffers[i].Phys = phys;
{
Card->RXBuffers[i].Virt = (void*)MM_AllocDMA(1, 32, &phys);
Card->RXBuffers[i].Phys = phys;
@@
-202,7
+200,6
@@
void Rhine2_int_InitialiseCard(tCard *Card)
tIPStackBuffer *Rhine2_WaitPacket(void *Ptr)
{
tCard *card = Ptr;
tIPStackBuffer *Rhine2_WaitPacket(void *Ptr)
{
tCard *card = Ptr;
- tIPStackBuffer *ret;
struct sRXDesc *desc;
int nDesc;
struct sRXDesc *desc;
int nDesc;
@@
-228,7
+225,7
@@
tIPStackBuffer *Rhine2_WaitPacket(void *Ptr)
LOG("%i descriptors in packet", nDesc);
LOG("%i descriptors in packet", nDesc);
- ret = IPStack_Buffer_CreateBuffer(nDesc);
+
tIPStackBuffer *
ret = IPStack_Buffer_CreateBuffer(nDesc);
desc = card->NextRX;
while( !(desc->Length & (1 << 15)) )
{
desc = card->NextRX;
while( !(desc->Length & (1 << 15)) )
{
@@
-329,7
+326,7
@@
int Rhine2_SendPacket(void *Ptr, tIPStackBuffer *Buffer)
card->NextTX = (card->NextTX + nDescs) % N_TX_DESCS;
desc = card->TXDescs + first_desc_id;
card->NextTX = (card->NextTX + nDescs) % N_TX_DESCS;
desc = card->TXDescs + first_desc_id;
- desc->TXBufferStart = MM_GetPhysAddr(
(tVAddr)
data );
+ desc->TXBufferStart = MM_GetPhysAddr( data );
desc->BufferSize = len | (1 << 15);
desc->TSR = 0;
desc->TCR = 0;
desc->BufferSize = len | (1 << 15);
desc->TSR = 0;
desc->TCR = 0;
@@
-408,7
+405,7
@@
struct sRXDesc *Rhine2_int_GetDescFromPhys(tCard *Card, Uint32 Addr)
void *Rhine2_int_GetBufferFromPhys(tCard *Card, Uint32 Addr)
{
void *Rhine2_int_GetBufferFromPhys(tCard *Card, Uint32 Addr)
{
- for( int i = 0; i < N_RX_PAGES; i ++ )
+ for( int i = 0; i < N_RX_
BUF_
PAGES; i ++ )
{
if( Card->RXBuffers[i].Phys > Addr ) continue;
if( Card->RXBuffers[i].Phys + PAGE_SIZE <= Addr ) continue;
{
if( Card->RXBuffers[i].Phys > Addr ) continue;
if( Card->RXBuffers[i].Phys + PAGE_SIZE <= Addr ) continue;
UCC
git Repository :: git.ucc.asn.au