From 0a05bd2063fe25875e1cf0710f7182d15465df8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Colin=20G=C3=BCnther?= Date: Thu, 3 Dec 2009 13:41:29 +0000 Subject: [PATCH] Removing superflous functions. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@34463 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/libs/compat/freebsd_network/Condvar.cpp | 11 ----------- src/libs/compat/freebsd_network/device.h | 3 --- src/libs/compat/freebsd_network/driver.c | 13 +++---------- 3 files changed, 3 insertions(+), 24 deletions(-) diff --git a/src/libs/compat/freebsd_network/Condvar.cpp b/src/libs/compat/freebsd_network/Condvar.cpp index 968fc73ba5..5c9a2b2ecc 100644 --- a/src/libs/compat/freebsd_network/Condvar.cpp +++ b/src/libs/compat/freebsd_network/Condvar.cpp @@ -20,17 +20,6 @@ extern "C" { #define ticks_to_usecs(t) (1000000*((bigtime_t)t) / hz) -status_t -init_condition_variables() -{ - return B_OK; -} - - -void -uninit_condition_variables() {} - - void conditionPublish(struct cv* variable, const void* waitChannel, const char* description) diff --git a/src/libs/compat/freebsd_network/device.h b/src/libs/compat/freebsd_network/device.h index f7f08f918c..78e1d59520 100644 --- a/src/libs/compat/freebsd_network/device.h +++ b/src/libs/compat/freebsd_network/device.h @@ -64,9 +64,6 @@ void uninit_mutexes(void); status_t init_taskqueues(void); void uninit_taskqueues(void); -status_t init_condition_variables(void); -void uninit_condition_variables(void); - status_t init_hard_clock(void); void uninit_hard_clock(void); diff --git a/src/libs/compat/freebsd_network/driver.c b/src/libs/compat/freebsd_network/driver.c index 3035b5b74c..e37ce4960e 100644 --- a/src/libs/compat/freebsd_network/driver.c +++ b/src/libs/compat/freebsd_network/driver.c @@ -163,19 +163,15 @@ _fbsd_init_driver(driver_t *driver) init_bounce_pages(); - status = init_condition_variables(); - if (status < B_OK) - goto err4; - if (HAIKU_DRIVER_REQUIRES(FBSD_TASKQUEUES)) { status = init_taskqueues(); if (status < B_OK) - goto err5; + goto err4; } status = init_wlan_stack(); if (status < B_OK) - goto err6; + goto err5; while (gDeviceCount < MAX_DEVICES) { device_t root, device; @@ -213,11 +209,9 @@ _fbsd_init_driver(driver_t *driver) uninit_wlan_stack(); -err6: +err5: if (HAIKU_DRIVER_REQUIRES(FBSD_TASKQUEUES)) uninit_taskqueues(); -err5: - uninit_condition_variables(); err4: uninit_mbufs(); err3: @@ -242,7 +236,6 @@ _fbsd_uninit_driver(driver_t *driver) } uninit_wlan_stack(); - uninit_condition_variables(); uninit_bounce_pages(); uninit_mbufs(); if (HAIKU_DRIVER_REQUIRES(FBSD_TASKQUEUES))