From: Marco Roeland <marco.roeland@xs4all.nl>
To: Rolf Eike Beer <eike-kernel@sf-tec.de>
Cc: Linux Kernel Development <linux-kernel@vger.kernel.org>
Subject: Re: Linux 2.5.66
Date: Tue, 25 Mar 2003 09:29:02 +0100 [thread overview]
Message-ID: <20030325082902.GA5328@localhost> (raw)
In-Reply-To: <200303250905.53881@bilbo.math.uni-mannheim.de>
On Tuesday 25th March 2003 at 09:05 uur Rolf Eike Beer wrote:
> It was broken somewhere between -bk1 and -bk4.
Geert Uytterhoeven posted this patch for it, two days ago, it is already
present in 2.5.65-ac4.
--- linux-2.5.x/include/asm-generic/rtc.h.orig Mon Feb 10 21:59:25 2003
+++ linux-2.5.x/include/asm-generic/rtc.h Sun Mar 23 11:47:24 2003
@@ -22,9 +22,8 @@
#define RTC_AIE 0x20 /* alarm interrupt enable */
#define RTC_UIE 0x10 /* update-finished interrupt enable */
-extern void gen_rtc_interrupt(unsigned long);
-
/* some dummy definitions */
+#define RTC_BATT_BAD 0x100 /* battery bad */
#define RTC_SQWE 0x08 /* enable square-wave output */
#define RTC_DM_BINARY 0x04 /* all time/date values are BCD if clear */
#define RTC_24H 0x02 /* 24 hour mode - else hours bit 7 means pm */
@@ -43,7 +42,7 @@
return uip;
}
-static inline void get_rtc_time(struct rtc_time *time)
+static inline unsigned int get_rtc_time(struct rtc_time *time)
{
unsigned long uip_watchdog = jiffies;
unsigned char ctrl;
@@ -108,6 +107,8 @@
time->tm_year += 100;
time->tm_mon--;
+
+ return RTC_24H;
}
/* Set the current date and time in the real time clock. */
--- linux-2.5.x/include/asm-parisc/rtc.h.orig Wed Aug 28 08:33:46 2002
+++ linux-2.5.x/include/asm-parisc/rtc.h Sun Mar 23 11:52:15 2003
@@ -24,7 +24,7 @@
#define RTC_AIE 0x20 /* alarm interrupt enable */
#define RTC_UIE 0x10 /* update-finished interrupt enable */
-extern void gen_rtc_interrupt(unsigned long);
+#define RTC_BATT_BAD 0x100 /* battery bad */
/* some dummy definitions */
#define RTC_SQWE 0x08 /* enable square-wave output */
@@ -44,14 +44,14 @@
{ 0, 31, 60, 91, 121, 152, 182, 213, 244, 274, 305, 335, 366 }
};
-static int get_rtc_time(struct rtc_time *wtime)
+static inline unsigned int get_rtc_time(struct rtc_time *wtime)
{
struct pdc_tod tod_data;
long int days, rem, y;
const unsigned short int *ip;
if(pdc_tod_read(&tod_data) < 0)
- return -1;
+ return RTC_24H | RTC_BATT_BAD;
// most of the remainder of this function is:
@@ -93,7 +93,7 @@
wtime->tm_mon = y;
wtime->tm_mday = days + 1;
- return 0;
+ return RTC_24H;
}
static int set_rtc_time(struct rtc_time *wtime)
--- linux-2.5.x/include/asm-ppc/rtc.h.orig Tue Feb 18 10:08:44 2003
+++ linux-2.5.x/include/asm-ppc/rtc.h Sun Mar 23 11:47:31 2003
@@ -35,15 +35,14 @@
#define RTC_AIE 0x20 /* alarm interrupt enable */
#define RTC_UIE 0x10 /* update-finished interrupt enable */
-extern void gen_rtc_interrupt(unsigned long);
-
/* some dummy definitions */
+#define RTC_BATT_BAD 0x100 /* battery bad */
#define RTC_SQWE 0x08 /* enable square-wave output */
#define RTC_DM_BINARY 0x04 /* all time/date values are BCD if clear */
#define RTC_24H 0x02 /* 24 hour mode - else hours bit 7 means pm */
#define RTC_DST_EN 0x01 /* auto switch DST - works f. USA only */
-static inline void get_rtc_time(struct rtc_time *time)
+static inline unsigned int get_rtc_time(struct rtc_time *time)
{
if (ppc_md.get_rtc_time) {
unsigned long nowtime;
@@ -55,6 +54,7 @@
time->tm_year -= 1900;
time->tm_mon -= 1; /* Make sure userland has a 0-based month */
}
+ return RTC_24H;
}
/* Set the current date and time in the real time clock. */
next prev parent reply other threads:[~2003-03-25 8:19 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2003-03-24 23:26 Linux 2.5.66 Linus Torvalds
2003-03-24 23:35 ` Larry McVoy
2003-03-25 0:14 ` Florin Iucha
2003-03-25 8:05 ` Rolf Eike Beer
2003-03-25 8:29 ` Marco Roeland [this message]
2003-03-25 0:16 ` Jeremy Brown
2003-03-25 0:22 ` Udo A. Steinberg
2003-03-25 0:30 ` Greg KH
2003-03-25 1:18 ` Udo A. Steinberg
2003-03-25 1:47 ` Greg KH
2003-03-25 4:18 ` CaT
2003-03-25 4:34 ` Greg KH
2003-03-25 5:56 ` CaT
2003-03-25 6:51 ` Greg KH
2003-03-25 7:22 ` CaT
2003-03-25 7:27 ` Greg KH
2003-03-25 0:53 ` John Cherry
2003-03-25 1:55 ` [REPRODUCABLE BUGS] " Toplica Tanaskovic
2003-03-25 3:19 ` James Simmons
2003-03-25 9:51 ` Toplica Tanaskovic
2003-03-26 20:24 ` James Simmons
2003-03-26 23:49 ` Torrey Hoffman
2003-03-27 0:20 ` James Simmons
2003-03-27 2:27 ` Joshua Kwan
2003-04-02 22:16 ` James Simmons
2003-04-03 1:02 ` Joshua Kwan
2003-04-03 3:59 ` James Simmons
2003-03-27 16:05 ` Toplica Tanaskovic
2003-03-26 2:53 ` Paweł Gołaszewski
2003-03-26 3:33 ` James Simmons
2003-03-26 11:00 ` [2.5 patch] fix sound/oss/mad16.c compile Adrian Bunk
2003-03-26 11:26 ` 2.5.66: compile problem with snd-ice1724 Adrian Bunk
2003-03-26 12:45 ` [2.5 patch] fix ipmi_devintf.c compilation Adrian Bunk
2003-03-26 14:36 ` Corey Minyard
-- strict thread matches above, loose matches on Subject: below --
2003-03-25 5:51 Linux 2.5.66 Andries.Brouwer
2003-03-26 10:45 ` Geert Uytterhoeven
2003-03-26 10:46 ` Geert Uytterhoeven
2003-03-25 7:40 Osamu Tomita
2003-03-26 11:52 Andries.Brouwer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20030325082902.GA5328@localhost \
--to=marco.roeland@xs4all.nl \
--cc=eike-kernel@sf-tec.de \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox