Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename dsrtc to ds1687rtc to avoid conflicting with the MI i2c

Browse Source 
ds1307 driver.

Hi Jason.
This commit is contained in:
skrll 2003-10-21 08:15:39 +00:00
parent 1176590ac1
commit 601de4df8c
5 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/arch/arm/footbridge/isa/dsrtc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: dsrtc.c,v 1.5 2003/03/23 14:12:26 chris Exp $ */
/* $NetBSD: dsrtc.c,v 1.6 2003/10/21 08:15:39 skrll Exp $ */
/*
* Copyright (c) 1998 Mark Brinicombe.
@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: dsrtc.c,v 1.5 2003/03/23 14:12:26 chris Exp $");
__KERNEL_RCSID(0, "$NetBSD: dsrtc.c,v 1.6 2003/10/21 08:15:39 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -197,7 +197,7 @@ dsrtc_read(arg, rtc)
}
/* device and attach structures */
CFATTACH_DECL(dsrtc, sizeof(struct dsrtc_softc),
CFATTACH_DECL(ds1687rtc, sizeof(struct dsrtc_softc),
dsrtcmatch, dsrtcattach, NULL, NULL);
/*

4
sys/arch/cats/conf/GENERIC
View File

@ -1,4 +1,4 @@
# $NetBSD: GENERIC,v 1.56 2003/10/21 08:03:16 skrll Exp $
# $NetBSD: GENERIC,v 1.57 2003/10/21 08:15:40 skrll Exp $
#
# GENERIC machine description file
#
@ -480,7 +480,7 @@ lpt1 at isa? port 0x278 irq 5
# The spkr driver provides a simple tone interface to the built in speaker.
spkr0 at pcppi? # PC speaker
dsrtc0 at isa? port 0x72 # Dallas RTC
ds1687rtc0 at isa? port 0x72 # Dallas 1687 RTC
# ISA Plug-and-Play audio devices
ess* at isapnp? # ESS Tech ES1887, ES1888, ES888 audio

8
sys/arch/cats/conf/INSTALL
View File

@ -1,4 +1,4 @@
# $NetBSD: INSTALL,v 1.33 2003/10/21 08:03:16 skrll Exp $
# $NetBSD: INSTALL,v 1.34 2003/10/21 08:15:40 skrll Exp $
#
# CATSINST -- CHALTECH CATS Install kernel
#
@ -264,8 +264,8 @@ ne* at pci? dev ? function ? # NE2000 compat ethernet
#ntwoc* at pci? dev ? function ? # Riscom/N2 PCI Sync Serial
sip* at pci? dev ? function ? # SiS 900 Ethernet
#tl* at pci? dev ? function ? # ThunderLAN-based Ethernet
de* at pci? dev ? function ? # DECchip 21x4x and clones
#tlp* at pci? dev ? function ? # DECchip 21x4x and clones
#de* at pci? dev ? function ? # DECchip 21x4x and clones
tlp* at pci? dev ? function ? # DECchip 21x4x and clones
vr* at pci? dev ? function ? # VIA Rhine Fast Ethernet
#lmc* at pci? dev ? function ? # Lan Media Corp SSI/HSSI/DS3
rtk* at pci? dev ? function ? # Realtek 8129/8139
@ -401,7 +401,7 @@ lpt1 at isa? port 0x278 irq 5
# The spkr driver provides a simple tone interface to the built in speaker.
#spkr0 at pcppi? # PC speaker
dsrtc0 at isa? port 0x72 # Dallas RTC
ds1687rtc0 at isa? port 0x72 # Dallas RTC
# ISA Plug-and-Play audio devices
#ess* at isapnp? # ESS Tech ES1887, ES1888, ES888 audio

9
sys/arch/cats/conf/files.cats
View File

@ -1,4 +1,4 @@
# $NetBSD: files.cats,v 1.26 2003/10/08 17:29:59 bouyer Exp $
# $NetBSD: files.cats,v 1.27 2003/10/21 08:15:40 skrll Exp $
#
# CATS-specific configuration info
#
@ -76,9 +76,10 @@ device sysbeep
attach sysbeep at pcppi with sysbeep_isa
file arch/arm/footbridge/isa/sysbeep_isa.c sysbeep_isa
device dsrtc: todservice
attach dsrtc at isa
file arch/arm/footbridge/isa/dsrtc.c dsrtc
device ds1687rtc: todservice
attach ds1687rtc at isa
file arch/arm/footbridge/isa/dsrtc.c ds1687rtc
# Machine-independent I2O drivers.
include "dev/i2o/files.i2o"

8
sys/arch/netwinder/conf/files.netwinder
View File

@ -1,4 +1,4 @@
# $NetBSD: files.netwinder,v 1.29 2003/10/08 17:29:59 bouyer Exp $
# $NetBSD: files.netwinder,v 1.30 2003/10/21 08:15:40 skrll Exp $
#
# First try for arm-specific configuration info
#
@ -77,9 +77,9 @@ device sysbeep
attach sysbeep at pcppi with sysbeep_isa
file arch/arm/footbridge/isa/sysbeep_isa.c sysbeep_isa
device dsrtc: todservice
attach dsrtc at isa
file arch/arm/footbridge/isa/dsrtc.c dsrtc
device ds1687rtc: todservice
attach ds1687rtc at isa
file arch/arm/footbridge/isa/dsrtc.c ds1687rtc
# Machine-independent I2O drivers.
include "dev/i2o/files.i2o"