From 05ca50f27d3a1d96068b5a84791339692e50406b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Fri, 24 Oct 2003 12:09:20 +0000 Subject: [PATCH] Fixed warnings. git-svn-id: file:///srv/svn/repos/haiku/trunk/current@5141 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../core/arch/x86/arch_real_time_clock.c | 3 +- src/kernel/core/real_time_clock.c | 81 ++++++++++--------- 2 files changed, 42 insertions(+), 42 deletions(-) diff --git a/src/kernel/core/arch/x86/arch_real_time_clock.c b/src/kernel/core/arch/x86/arch_real_time_clock.c index b194926284..4b363ef526 100644 --- a/src/kernel/core/arch/x86/arch_real_time_clock.c +++ b/src/kernel/core/arch/x86/arch_real_time_clock.c @@ -173,7 +173,7 @@ cmos_to_secs(const cmos_time *cmos) { uint32 wholeYear; uint32 time = 0; - int i; + uint32 i; wholeYear = bcd_to_int(cmos->century) * 100 + bcd_to_int(cmos->year); @@ -206,7 +206,6 @@ secs_to_cmos(uint32 seconds, cmos_time *cmos) uint32 secsThisYear; bool keepLooping; bool isLeapYear; - int i; int temp; int month; diff --git a/src/kernel/core/real_time_clock.c b/src/kernel/core/real_time_clock.c index c04549aa60..409216356c 100644 --- a/src/kernel/core/real_time_clock.c +++ b/src/kernel/core/real_time_clock.c @@ -15,46 +15,6 @@ static bigtime_t sBootTime; -static void -rtc_print(void) -{ - uint32 currentTime; - - currentTime = (sBootTime + system_time()) / 1000000; - dprintf("system_time: %u\n", (unsigned)system_time()); - dprintf("boot_time: %u\n", (unsigned)sBootTime); - dprintf("current_time: %u\n", (unsigned)currentTime); -} - - -static int -rtc_debug(int argc, char **argv) -{ - if (argc < 2) { - // If no arguments were given, output all usefull data. - rtc_print(); - } else { - // If there was an argument, reset the system and hw time. - rtc_set_system_time(strtoul(argv[1], NULL, 10)); - rtc_system_to_hw(); - } - - return 0; -} - - -status_t -rtc_init(kernel_args *ka) -{ - //dprintf("rtc_init: entry\n"); - add_debugger_command("rtc", &rtc_debug, "Set and test the real-time clock"); - - rtc_hw_to_system(); - - return B_OK; -} - - void rtc_set_system_time(uint32 current_time) { @@ -94,3 +54,44 @@ rtc_boot_time(void) { return sBootTime; } + + +static void +rtc_print(void) +{ + uint32 currentTime; + + currentTime = (sBootTime + system_time()) / 1000000; + dprintf("system_time: %u\n", (unsigned)system_time()); + dprintf("boot_time: %u\n", (unsigned)sBootTime); + dprintf("current_time: %u\n", (unsigned)currentTime); +} + + +static int +rtc_debug(int argc, char **argv) +{ + if (argc < 2) { + // If no arguments were given, output all usefull data. + rtc_print(); + } else { + // If there was an argument, reset the system and hw time. + rtc_set_system_time(strtoul(argv[1], NULL, 10)); + rtc_system_to_hw(); + } + + return 0; +} + + +status_t +rtc_init(kernel_args *ka) +{ + //dprintf("rtc_init: entry\n"); + add_debugger_command("rtc", &rtc_debug, "Set and test the real-time clock"); + + rtc_hw_to_system(); + + return B_OK; +} +