Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

small cleanup

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@7594 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
beveloper 2004-05-15 23:54:19 +00:00
parent 889fc773aa
commit 4e729ddc16
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/add-ons/kernel/drivers/network/rtl8169/device.c
View File

@ -23,8 +23,6 @@
#include <fcntl.h> #include <fcntl.h>
#include <string.h> #include <string.h>
//#define DEBUG
#include "debug.h" #include "debug.h"
#include "device.h" #include "device.h"
#include "driver.h" #include "driver.h"
@ -33,6 +31,7 @@
static int32 gOpenMask = 0; static int32 gOpenMask = 0;
static void static void
write_phy_reg(rtl8169_device *device, int reg, uint16 value) write_phy_reg(rtl8169_device *device, int reg, uint16 value)
{ {
@ -46,6 +45,7 @@ write_phy_reg(rtl8169_device *device, int reg, uint16 value)
} }
} }
static uint16 static uint16
read_phy_reg(rtl8169_device *device, int reg) read_phy_reg(rtl8169_device *device, int reg)
{ {
@ -62,6 +62,7 @@ read_phy_reg(rtl8169_device *device, int reg)
return 0xffff; return 0xffff;
} }
static inline void static inline void
write_phy_reg_bit(rtl8169_device *device, int reg, int bitnum, int bitval) write_phy_reg_bit(rtl8169_device *device, int reg, int bitnum, int bitval)
{ {
@ -73,6 +74,7 @@ write_phy_reg_bit(rtl8169_device *device, int reg, int bitnum, int bitval)
write_phy_reg(device, reg, val); write_phy_reg(device, reg, val);
} }
static void static void
phy_config(rtl8169_device *device) phy_config(rtl8169_device *device)
{ {
@ -250,6 +252,7 @@ init_buf_desc(rtl8169_device *device)
return B_OK; return B_OK;
} }
static inline void static inline void
rtl8169_tx_int(rtl8169_device *device) rtl8169_tx_int(rtl8169_device *device)
{ {
@ -415,8 +418,8 @@ rtl8169_open(const char *name, uint32 flags, void** cookie)
val = gPci->read_pci_config(device->pciInfo->bus, device->pciInfo->device, device->pciInfo->function, 0x14, 4); val = gPci->read_pci_config(device->pciInfo->bus, device->pciInfo->device, device->pciInfo->function, 0x14, 4);
val &= PCI_address_memory_32_mask; val &= PCI_address_memory_32_mask;
TRACE("hardware register address %p\n", (void *) val); TRACE("hardware register address %p\n", (void *) val);
device->refArea = map_mem(&device->regAddr, (void *)val, 256, 0, "rtl8169 register"); device->regArea = map_mem(&device->regAddr, (void *)val, 256, 0, "rtl8169 register");
if (device->refArea < B_OK) { if (device->regArea < B_OK) {
ERROR("can't map hardware registers\n"); ERROR("can't map hardware registers\n");
goto err; goto err;
} }
@ -533,7 +536,7 @@ rtl8169_open(const char *name, uint32 flags, void** cookie)
err: err:
delete_sem(device->rxReadySem); delete_sem(device->rxReadySem);
delete_sem(device->txFreeSem); delete_sem(device->txFreeSem);
delete_area(device->refArea); delete_area(device->regArea);
delete_area(device->txBufArea); delete_area(device->txBufArea);
delete_area(device->rxBufArea); delete_area(device->rxBufArea);
delete_area(device->txDescArea); delete_area(device->txDescArea);
@ -575,7 +578,7 @@ rtl8169_free(void* cookie)
delete_sem(device->rxReadySem); delete_sem(device->rxReadySem);
delete_sem(device->txFreeSem); delete_sem(device->txFreeSem);
delete_area(device->refArea); delete_area(device->regArea);
delete_area(device->txBufArea); delete_area(device->txBufArea);
delete_area(device->rxBufArea); delete_area(device->rxBufArea);
delete_area(device->txDescArea); delete_area(device->txDescArea);

8
src/add-ons/kernel/drivers/network/rtl8169/device.h
View File

@ -55,20 +55,20 @@ typedef struct {
volatile int32 rxIntIndex; // current descriptor that needs be checked volatile int32 rxIntIndex; // current descriptor that needs be checked
volatile int32 rxFree; volatile int32 rxFree;
volatile buf_desc * txDesc; volatile buf_desc * txDesc;
volatile buf_desc * rxDesc; volatile buf_desc * rxDesc;
area_id txDescArea; area_id txDescArea;
area_id rxDescArea; area_id rxDescArea;
area_id txBufArea;
area_id rxBufArea;
void * txBuf[TX_DESC_COUNT]; void * txBuf[TX_DESC_COUNT];
void * rxBuf[RX_DESC_COUNT]; void * rxBuf[RX_DESC_COUNT];
area_id txBufArea;
area_id rxBufArea;
void * regAddr; void * regAddr;
area_id refArea; area_id regArea;
uint8 irq; uint8 irq;
uint8 macaddr[6]; uint8 macaddr[6];