diff options
author | Imre Kaloz <kaloz@openwrt.org> | 2005-06-10 00:58:19 +0000 |
---|---|---|
committer | Imre Kaloz <kaloz@openwrt.org> | 2005-06-10 00:58:19 +0000 |
commit | e091c662cc4a7d80f40dd6c92f93eeafbcabd746 (patch) | |
tree | dd9baeb45376389b0bc47e3eb111e2323dbbf346 | |
parent | 9108389d743ae3ac6b2fc0998458a5ecb996aaa4 (diff) | |
download | upstream-e091c662cc4a7d80f40dd6c92f93eeafbcabd746.tar.gz upstream-e091c662cc4a7d80f40dd6c92f93eeafbcabd746.tar.bz2 upstream-e091c662cc4a7d80f40dd6c92f93eeafbcabd746.zip |
fix nas compatibility and overrides for newer wla2-g54l units
SVN-Revision: 1181
-rw-r--r-- | openwrt/package/openwrt/libshared/bcmtimer.h | 2 | ||||
-rw-r--r-- | openwrt/package/openwrt/libshared/linux_timer.c | 35 | ||||
-rw-r--r-- | openwrt/target/default/target_skeleton/etc/nvram.overrides | 3 |
3 files changed, 37 insertions, 3 deletions
diff --git a/openwrt/package/openwrt/libshared/bcmtimer.h b/openwrt/package/openwrt/libshared/bcmtimer.h index 560957cbfd..3db9e624f9 100644 --- a/openwrt/package/openwrt/libshared/bcmtimer.h +++ b/openwrt/package/openwrt/libshared/bcmtimer.h @@ -30,11 +30,13 @@ typedef void (*bcm_timer_cb)(bcm_timer_id id, int data); /* OS-independant interfaces, applications should call these functions only */ int bcm_timer_module_init(int timer_entries, bcm_timer_module_id *module_id); int bcm_timer_module_cleanup(bcm_timer_module_id module_id); +int bcm_timer_module_enable(bcm_timer_module_id module_id, int enable); int bcm_timer_create(bcm_timer_module_id module_id, bcm_timer_id *timer_id); int bcm_timer_delete(bcm_timer_id timer_id); int bcm_timer_gettime(bcm_timer_id timer_id, struct itimerspec *value); int bcm_timer_settime(bcm_timer_id timer_id, const struct itimerspec *value); int bcm_timer_connect(bcm_timer_id timer_id, bcm_timer_cb func, int data); int bcm_timer_cancel(bcm_timer_id timer_id); +int bcm_timer_change_expirytime(bcm_timer_id timer_id, const struct itimerspec *timer_spec); #endif /* #ifndef __bcmtimer_h__ */ diff --git a/openwrt/package/openwrt/libshared/linux_timer.c b/openwrt/package/openwrt/libshared/linux_timer.c index eece9f84e8..0402e44378 100644 --- a/openwrt/package/openwrt/libshared/linux_timer.c +++ b/openwrt/package/openwrt/libshared/linux_timer.c @@ -112,7 +112,7 @@ static void check_timer(); #if THIS_FINDS_USE static int count_queue(struct event *); #endif - +static int timer_change_settime(timer_t timer_id, const struct itimerspec *timer_spec); void block_timer(); void unblock_timer(); @@ -247,6 +247,23 @@ int timer_connect return 0; } +/* + * Please Call this function only from the call back functions of the alarm_handler. + * This is just a hack +*/ +int timer_change_settime +( + timer_t timerid, /* timer ID */ + const struct itimerspec * value /* time to be set */ +) +{ + struct event *event = (struct event *) timerid; + + TIMESPEC_TO_TIMEVAL(&event->it_interval, &value->it_interval); + TIMESPEC_TO_TIMEVAL(&event->it_value, &value->it_value); + + return 1; +} int timer_settime ( @@ -673,6 +690,16 @@ int bcm_timer_module_cleanup(bcm_timer_module_id module_id) return 0; } +/* Enable/Disable timer module */ +int bcm_timer_module_enable(bcm_timer_module_id module_id, int enable) +{ + if (enable) + unblock_timer(); + else + block_timer(); + return 0; +} + int bcm_timer_create(bcm_timer_module_id module_id, bcm_timer_id *timer_id) { module_id = 0; @@ -704,4 +731,8 @@ int bcm_timer_cancel(bcm_timer_id timer_id) timer_cancel((timer_t)timer_id); return 0; } - +int bcm_timer_change_expirytime(bcm_timer_id timer_id, const struct itimerspec *timer_spec) +{ + timer_change_settime((timer_t)timer_id, timer_spec); + return 1; +} diff --git a/openwrt/target/default/target_skeleton/etc/nvram.overrides b/openwrt/target/default/target_skeleton/etc/nvram.overrides index 533edadaec..f58f7ed7e6 100644 --- a/openwrt/target/default/target_skeleton/etc/nvram.overrides +++ b/openwrt/target/default/target_skeleton/etc/nvram.overrides @@ -51,7 +51,8 @@ remap () { # hacks for buffalo wla2-g54l [ "$(nvram get boardnum)" = "00" ] && \ -[ "$(nvram get product_name)" = "Product_name" ] && { +[ "$(nvram get product_name)" = "Product_name" ] || \ +[ "$(nvram get product_name)" = "WLA2-G54L" ] && { debug "### wla2-g54l hacks ###" NVRAM_wan_ifname="none" NVRAM_lan_ifnames="vlan0" |