From b8708997c57feff8414453b749ac81a535eb47b3 Mon Sep 17 00:00:00 2001 From: beveloper Date: Mon, 3 May 2004 23:05:14 +0000 Subject: [PATCH] the add_timer() function does panic, also it would call the hook in interrupt context, both it not acceptable. Commented it out git-svn-id: file:///srv/svn/repos/haiku/trunk/current@7392 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../kernel/drivers/network/ipro1000/if_em_osdep.c | 4 ++-- .../kernel/drivers/network/ipro1000/if_em_osdep.h | 9 +++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/add-ons/kernel/drivers/network/ipro1000/if_em_osdep.c b/src/add-ons/kernel/drivers/network/ipro1000/if_em_osdep.c index 7947c2be5c..bad3c648f9 100644 --- a/src/add-ons/kernel/drivers/network/ipro1000/if_em_osdep.c +++ b/src/add-ons/kernel/drivers/network/ipro1000/if_em_osdep.c @@ -57,7 +57,7 @@ timeout(timeout_func func, void *cookie, bigtime_t timeout) h.func = func; h.cookie = cookie; - add_timer(&h.t, timer_dispatch_hook, timeout, B_ONE_SHOT_RELATIVE_TIMER); +// add_timer(&h.t, timer_dispatch_hook, timeout, B_ONE_SHOT_RELATIVE_TIMER); return h; } @@ -65,7 +65,7 @@ timeout(timeout_func func, void *cookie, bigtime_t timeout) void untimeout(timeout_func func, void *cookie, struct callout_handle handle) { - cancel_timer(&handle.t); +// cancel_timer(&handle.t); } struct resource * diff --git a/src/add-ons/kernel/drivers/network/ipro1000/if_em_osdep.h b/src/add-ons/kernel/drivers/network/ipro1000/if_em_osdep.h index 67120ff50d..f03d794c72 100644 --- a/src/add-ons/kernel/drivers/network/ipro1000/if_em_osdep.h +++ b/src/add-ons/kernel/drivers/network/ipro1000/if_em_osdep.h @@ -221,6 +221,15 @@ void driver_free(void *p, int p2); #define E1000_WRITE_REG_ARRAY(hw, reg, index, value) \ E1000_WRITE_OFFSET(hw, E1000_REG_OFFSET(hw, reg) + ((index) << 2), value) + +/* +#define TAILQ_FIRST(head) ((head)->tqh_first) +#define TAILQ_NEXT(elm, field) ((elm)->field.tqe_next) +#define TAILQ_FOREACH(var, head, field) \ + for ((var) = TAILQ_FIRST((head)); \ + (var); \ + (var) = TAILQ_NEXT((var), field)) +*/ // used only for multicast setup, fix later... #define TAILQ_FOREACH(a, b, c) for (a = 0; a != 0; a = 0)