i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added info texts, init_hardware() now searches for hardware, replaced LOG with TRACE

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@7383 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
beveloper
2004-05-03 21:53:42 +00:00
parent c376689374
commit 38f15423db
2 changed files with 34 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/drivers/network/rtl8169/driver.c
+31 -7
View File
@@ -7,10 +7,16 @@
#include <stdio.h> #include <stdio.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"
#define INFO1 "rtl8169: Realtek RTL8169 Family Driver. Version 1.0"
#define INFO2 "rtl8169: Copyright (C) 2004 Marcus Overhagen <[email protected]>"
#define INFO3 "rtl8169: All rights reserved. Build " __DATE__ " "__TIME__
int32 api_version = B_CUR_DRIVER_API_VERSION; int32 api_version = B_CUR_DRIVER_API_VERSION;
pci_module_info *gPci; pci_module_info *gPci;
@@ -18,12 +24,26 @@ pci_module_info *gPci;
char* gDevNameList[MAX_CARDS + 1]; char* gDevNameList[MAX_CARDS + 1];
pci_info *gDevList[MAX_CARDS]; pci_info *gDevList[MAX_CARDS];
status_t status_t
init_hardware(void) init_hardware(void)
{ {
LOG("rtl8169: init_hardware()\n"); pci_module_info *pci;
return B_OK; pci_info info;
status_t res;
int i;
TRACE("init_hardware()\n");
if (get_module(B_PCI_MODULE_NAME, (module_info **)&pci) < B_OK)
return B_ERROR;
for (res = B_ERROR, i = 0; pci->get_nth_pci_info(i, &info) == B_OK; i++) {
if (info.vendor_id == 0x10ec && info.device_id == 0x8169) {
res = B_OK;
break;
}
}
put_module(B_PCI_MODULE_NAME);
return res;
} }
@@ -33,8 +53,10 @@ init_driver(void)
struct pci_info *item; struct pci_info *item;
int index; int index;
int cards; int cards;
LOG("rtl8169: init_driver()\n"); dprintf(INFO1"\n");
dprintf(INFO2"\n");
dprintf(INFO3"\n");
#ifdef DEBUG #ifdef DEBUG
set_dprintf_enabled(true); set_dprintf_enabled(true);
@@ -59,10 +81,12 @@ init_driver(void)
item = (pci_info *)malloc(sizeof(pci_info)); item = (pci_info *)malloc(sizeof(pci_info));
if (!item) if (!item)
return B_OK; // already found 1 card, but out of memory return B_OK; // already found 1 card, but out of memory
if (cards == MAX_CARDS)
break;
} }
} }
LOG("rtl8169: found %d cards\n", cards); TRACE("found %d cards\n", cards);
free(item); free(item);
@@ -80,7 +104,7 @@ uninit_driver(void)
{ {
int32 i; int32 i;
LOG("rtl8169: uninit_driver()\n"); TRACE("uninit_driver()\n");
for (i = 0; gDevNameList[i] != NULL; i++) { for (i = 0; gDevNameList[i] != NULL; i++) {
free(gDevList[i]); free(gDevList[i]);
src/add-ons/kernel/drivers/network/rtl8169/driver.h
+3
View File
@@ -1,3 +1,6 @@
/* Realtek RTL8169 Family Driver
* Copyright (C) 2004 Marcus Overhagen <[email protected]>. All rights reserved.
*/
#ifndef __DRIVER_H #ifndef __DRIVER_H
#define __DRIVER_H #define __DRIVER_H