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

* Fixed warnings, and turned off debugging output.

Browse Source 
* This fixes bug #2274.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@25796 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2008-06-03 19:06:57 +00:00
parent 199893c3f3
commit 84a1454548
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/drivers/network/etherpci/etherpci.c
+12 -7
View File
@@ -39,9 +39,14 @@ int32 api_version = B_CUR_DRIVER_API_VERSION;
/* diagnostic debug flags - compile in here or set while running with debugger "AcmeRoadRunner" command */ /* diagnostic debug flags - compile in here or set while running with debugger "AcmeRoadRunner" command */
#define DEFAULT_DEBUG_FLAGS ( ERR | INFO | WARN | FUNCTION ) #define DEFAULT_DEBUG_FLAGS ( ERR | INFO | WARN | FUNCTION )
#define ETHER_DEBUG(mask, enabled, format, args...) \ //#define TRACE_ETHERPCI
do { if (mask & enabled) \ #ifdef TRACE_ETHERPCI
dprintf(format , ##args); } while (0) # define ETHER_DEBUG(mask, enabled, format, args...) \
do { if (mask & enabled) \
dprintf(format , ##args); } while (0)
#else
# define ETHER_DEBUG(mask, enabled, format, args...) ;
#endif
static pci_module_info *gPCIModInfo; static pci_module_info *gPCIModInfo;
@@ -1494,7 +1499,7 @@ open_hook(const char *name, uint32 flags, void **cookie)
data->nonblocking = 0; data->nonblocking = 0;
data->debug = DEFAULT_DEBUG_FLAGS; data->debug = DEFAULT_DEBUG_FLAGS;
ETHER_DEBUG(FUNCTION, data->debug, kDevName ": open %s dev=%x\n", name, data); ETHER_DEBUG(FUNCTION, data->debug, kDevName ": open %s dev=%p\n", name, data);
#if DEBUGGER_COMMAND #if DEBUGGER_COMMAND
gdev = data; gdev = data;
@@ -1543,7 +1548,7 @@ static status_t
close_hook(void *_data) close_hook(void *_data)
{ {
etherpci_private_t *data = (etherpci_private_t *)_data; etherpci_private_t *data = (etherpci_private_t *)_data;
ETHER_DEBUG(FUNCTION, data->debug, kDevName ": close dev=%x\n", data); ETHER_DEBUG(FUNCTION, data->debug, kDevName ": close dev=%p\n", data);
/* /*
* Force pending reads and writes to terminate * Force pending reads and writes to terminate
@@ -1613,7 +1618,7 @@ free_hook(void *_data)
etherpci_private_t *data = (etherpci_private_t *)_data; etherpci_private_t *data = (etherpci_private_t *)_data;
int32 mask; int32 mask;
ETHER_DEBUG(FUNCTION, data->debug, kDevName ": free %s dev=%x\n", data); ETHER_DEBUG(FUNCTION, data->debug, kDevName ": free dev=%p\n", data);
#if !__INTEL__ #if !__INTEL__
delete_area(data->ioarea); delete_area(data->ioarea);
@@ -1706,7 +1711,7 @@ control_hook(void *_data, uint32 msg, void *buf, size_t len)
return B_OK; return B_OK;
case ETHER_ADDMULTI: case ETHER_ADDMULTI:
ETHER_DEBUG(FUNCTION, data->debug, kDevName ": control: DO_MULTI %x\n"); ETHER_DEBUG(FUNCTION, data->debug, kDevName ": control: DO_MULTI\n");
return domulti(data, (char *)buf); return domulti(data, (char *)buf);
} }