<machine/rtc.h> is really only footbridge-specific, so, after pruning it from

dead meat, move the remainding definition to footbridge todclockvar where
it belongs, and get rid of the installed header file.

No change on Zaurus (besides the include removal), no functional change on cats.

5 files changed, 16 insertions, 92 deletions

diff --git a/sys/arch/arm/footbridge/footbridgevar.h b/sys/arch/arm/footbridge/footbridgevar.h
index 04cbe1ce74f..482d52b9e63 100644
--- a/sys/arch/arm/footbridge/footbridgevar.h
+++ b/sys/arch/arm/footbridge/footbridgevar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: footbridgevar.h,v 1.1 2004/02/01 05:09:49 drahn Exp $	*/
+/*	$OpenBSD: footbridgevar.h,v 1.2 2006/05/26 20:34:01 miod Exp $	*/
 /*	$NetBSD: footbridgevar.h,v 1.2 2002/02/10 12:26:00 chris Exp $	*/
 
 /*
@@ -36,7 +36,6 @@
  */
 
 #include <machine/bus.h>
-#include <machine/rtc.h>
 #include <dev/pci/pcivar.h>
 #include <arm/footbridge/todclockvar.h>
 
diff --git a/sys/arch/arm/footbridge/isa/dsrtc.c b/sys/arch/arm/footbridge/isa/dsrtc.c
index abd0b068209..46531d4ddd3 100644
--- a/sys/arch/arm/footbridge/isa/dsrtc.c
+++ b/sys/arch/arm/footbridge/isa/dsrtc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dsrtc.c,v 1.2 2004/05/19 03:17:07 drahn Exp $	*/
+/*	$OpenBSD: dsrtc.c,v 1.3 2006/05/26 20:34:03 miod Exp $	*/
 /*	$NetBSD: dsrtc.c,v 1.5 2003/03/23 14:12:26 chris Exp $	*/
 
 /*
@@ -43,8 +43,6 @@
 #include <sys/conf.h>
 #include <sys/device.h>
 
-#include <machine/rtc.h>
-
 #include <arm/footbridge/todclockvar.h>
 #include <arm/footbridge/isa/ds1687reg.h>
 
diff --git a/sys/arch/arm/footbridge/todclock.c b/sys/arch/arm/footbridge/todclock.c
index 844fe664d38..63d3fe675e6 100644
--- a/sys/arch/arm/footbridge/todclock.c
+++ b/sys/arch/arm/footbridge/todclock.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: todclock.c,v 1.5 2005/05/26 19:52:28 pedro Exp $	*/
+/*	$OpenBSD: todclock.c,v 1.6 2006/05/26 20:34:01 miod Exp $	*/
 /*	$NetBSD: todclock.c,v 1.4 2002/10/02 05:02:30 thorpej Exp $	*/
 
 /*
@@ -53,7 +53,6 @@
 #include <sys/time.h>
 #include <sys/device.h>
 
-#include <machine/rtc.h>
 #include <arm/footbridge/todclockvar.h>
 
 #include "todclock.h"
diff --git a/sys/arch/arm/footbridge/todclockvar.h b/sys/arch/arm/footbridge/todclockvar.h
index 70c973621fd..45a5ee4c513 100644
--- a/sys/arch/arm/footbridge/todclockvar.h
+++ b/sys/arch/arm/footbridge/todclockvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: todclockvar.h,v 1.2 2004/05/19 03:17:07 drahn Exp $	*/
+/*	$OpenBSD: todclockvar.h,v 1.3 2006/05/26 20:34:01 miod Exp $	*/
 /*	$NetBSD: todclockvar.h,v 1.1 2002/02/10 12:26:00 chris Exp $	*/
 
 /*
@@ -40,6 +40,18 @@
  * Created      : 12/02/97
  */
 
+typedef struct {
+	u_char rtc_micro;
+	u_char rtc_centi;
+	u_char rtc_sec;
+	u_char rtc_min;
+	u_char rtc_hour;
+	u_char rtc_day;
+	u_char rtc_mon;
+	u_char rtc_year;
+	u_char rtc_cen;
+} rtc_t;
+
 /*
  * Attach args for todclock device
  */
diff --git a/sys/arch/arm/include/rtc.h b/sys/arch/arm/include/rtc.h
deleted file mode 100644
index 06b0caf175a..00000000000
--- a/sys/arch/arm/include/rtc.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*	$OpenBSD: rtc.h,v 1.2 2004/05/19 03:17:07 drahn Exp $	*/
-/*	$NetBSD: rtc.h,v 1.1 2001/02/23 21:23:50 reinoud Exp $	*/
-
-/*
- * Copyright (c) 1994 Mark Brinicombe.
- * Copyright (c) 1994 Brini.
- * All rights reserved.
- *
- * This code is derived from software written for Brini by Mark Brinicombe
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by Brini.
- * 4. The name of the company nor the name of the author may be used to
- *    endorse or promote products derived from this software without specific
- *    prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY BRINI ``AS IS'' AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL BRINI OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * RiscBSD kernel project
- *
- * rtc.h
- *
- * Header file for RTC / CMOS stuff
- *
- * Created      : 13/10/94
- * Updated	: 15/07/2000
- *
- * Based of kate/display/iiccontrol.c
- */
-
-/*
- * IIC addresses for RTC chip
- * Two PCF8583 chips are supported on the IIC bus
- */
-
-#define IIC_PCF8583_MASK 0xfc
-#define IIC_PCF8583_ADDR 0xa0
-
-#define RTC_Write (IIC_PCF8583_ADDR | IIC_WRITE)
-#define RTC_Read  (IIC_PCF8583_ADDR | IIC_READ)
-
-typedef struct {
-	u_char rtc_micro;
-	u_char rtc_centi;
-	u_char rtc_sec;
-	u_char rtc_min;
-	u_char rtc_hour;
-	u_char rtc_day;
-	u_char rtc_mon;
-	u_char rtc_year;
-	u_char rtc_cen;
-} rtc_t;
-
-#define RTC_ADDR_CHECKSUM	0x3f
-#define RTC_ADDR_BOOTOPTS	0x90
-#define RTC_ADDR_REBOOTCNT	0x91
-#define RTC_ADDR_YEAR     	0xc0
-#define RTC_ADDR_CENT     	0xc1
-
-#ifdef _KERNEL
-int cmos_read (int);
-int cmos_write (int, int);
-#endif /* _KERNEL */
-
-/* End of rtc.h */