Module Name: src
Committed By: kiyohara
Date: Tue Oct 4 15:06:59 UTC 2016
Modified Files:
src/sys/dev/i2c: ds1307.c ds1307reg.h
Log Message:
Add DS1340.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/dev/i2c/ds1307.c
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/i2c/ds1307reg.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/i2c/ds1307.c
diff -u src/sys/dev/i2c/ds1307.c:1.22 src/sys/dev/i2c/ds1307.c:1.23
--- src/sys/dev/i2c/ds1307.c:1.22 Tue Apr 5 10:53:16 2016
+++ src/sys/dev/i2c/ds1307.c Tue Oct 4 15:06:59 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: ds1307.c,v 1.22 2016/04/05 10:53:16 bouyer Exp $ */
+/* $NetBSD: ds1307.c,v 1.23 2016/10/04 15:06:59 kiyohara Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ds1307.c,v 1.22 2016/04/05 10:53:16 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ds1307.c,v 1.23 2016/10/04 15:06:59 kiyohara Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -83,6 +83,13 @@ static const struct dsrtc_model dsrtc_mo
.dm_rtc_size = DS1339_RTC_SIZE,
.dm_flags = DSRTC_FLAG_BCD,
}, {
+ .dm_model = 1340,
+ .dm_ch_reg = DSXXXX_SECONDS,
+ .dm_ch_value = DS1340_SECONDS_EOSC,
+ .dm_rtc_start = DS1340_RTC_START,
+ .dm_rtc_size = DS1340_RTC_SIZE,
+ .dm_flags = DSRTC_FLAG_BCD,
+ }, {
.dm_model = 1672,
.dm_rtc_start = DS1672_RTC_START,
.dm_rtc_size = DS1672_RTC_SIZE,
Index: src/sys/dev/i2c/ds1307reg.h
diff -u src/sys/dev/i2c/ds1307reg.h:1.6 src/sys/dev/i2c/ds1307reg.h:1.7
--- src/sys/dev/i2c/ds1307reg.h:1.6 Tue Apr 5 10:53:16 2016
+++ src/sys/dev/i2c/ds1307reg.h Tue Oct 4 15:06:59 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: ds1307reg.h,v 1.6 2016/04/05 10:53:16 bouyer Exp $ */
+/* $NetBSD: ds1307reg.h,v 1.7 2016/10/04 15:06:59 kiyohara Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
@@ -65,6 +65,10 @@
#define DS1339_NVRAM_START 0
#define DS1339_NVRAM_SIZE 0
+#define DS1340_RTC_START 0
+#define DS1340_RTC_SIZE DSXXXX_RTC_SIZE
+#define DS1340_SECONDS_EOSC (1 << 7) /* Clock Hold */
+
#define DS1672_CNTR1 0x00
#define DS1672_CNTR2 0x01
#define DS1672_CNTR3 0x02
