Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/dev/ic Replace hd44780_subr.h to hd44780var.h and instal...
details: https://anonhg.NetBSD.org/src/rev/0d91a6b9cf9e
branches: trunk
changeset: 572717:0d91a6b9cf9e
user: joff <joff%NetBSD.org@localhost>
date: Tue Jan 11 00:57:56 2005 +0000
description:
Replace hd44780_subr.h to hd44780var.h and install to userland.
diffstat:
sys/dev/ic/Makefile | 6 +-
sys/dev/ic/hd44780_subr.c | 8 +-
sys/dev/ic/hd44780_subr.h | 135 ----------------------------------------------
sys/dev/ic/hd44780var.h | 135 ++++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 142 insertions(+), 142 deletions(-)
diffs (truncated from 330 to 300 lines):
diff -r 0101470ea1d9 -r 0d91a6b9cf9e sys/dev/ic/Makefile
--- a/sys/dev/ic/Makefile Tue Jan 11 00:19:36 2005 +0000
+++ b/sys/dev/ic/Makefile Tue Jan 11 00:57:56 2005 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.22 2003/10/13 08:29:48 dyoung Exp $
+# $NetBSD: Makefile,v 1.23 2005/01/11 00:57:56 joff Exp $
INCSDIR= /usr/include/dev/ic
# Only install includes which are used by userland
-INCS= athioctl.h bt8xx.h icpreg.h icp_ioctl.h isp_ioctl.h mlxreg.h mlxio.h \
- rrunnerreg.h rrunnervar.h wdcreg.h wi_ieee.h
+INCS= athioctl.h bt8xx.h hd44780var.h icpreg.h icp_ioctl.h isp_ioctl.h \
+ mlxreg.h mlxio.h rrunnerreg.h rrunnervar.h wdcreg.h wi_ieee.h
.include <bsd.kinc.mk>
diff -r 0101470ea1d9 -r 0d91a6b9cf9e sys/dev/ic/hd44780_subr.c
--- a/sys/dev/ic/hd44780_subr.c Tue Jan 11 00:19:36 2005 +0000
+++ b/sys/dev/ic/hd44780_subr.c Tue Jan 11 00:57:56 2005 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: hd44780_subr.c,v 1.3 2005/01/09 15:43:56 joff Exp $ */
+/* $NetBSD: hd44780_subr.c,v 1.4 2005/01/11 00:57:56 joff Exp $ */
/*
* Copyright (c) 2002 Dennis I. Chernoivanov
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hd44780_subr.c,v 1.3 2005/01/09 15:43:56 joff Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hd44780_subr.c,v 1.4 2005/01/11 00:57:56 joff Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -46,7 +46,7 @@
#include <machine/bus.h>
#include <dev/ic/hd44780reg.h>
-#include <dev/ic/hd44780_subr.h>
+#include <dev/ic/hd44780var.h>
/*
* Finish device attach. sc_writereg, sc_readreg and sc_flags must be properly
@@ -71,7 +71,7 @@
if ((sc->sc_flags & HD_UP) == 0)
err = hd44780_init(sc);
if (err != 0)
- printf("%s: not responding or unconnected\n", sc->sc_dev->dv_xname);
+ printf("%s: LCD not responding or unconnected\n", sc->sc_dev->dv_xname);
}
}
diff -r 0101470ea1d9 -r 0d91a6b9cf9e sys/dev/ic/hd44780_subr.h
--- a/sys/dev/ic/hd44780_subr.h Tue Jan 11 00:19:36 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,135 +0,0 @@
-/* $NetBSD: hd44780_subr.h,v 1.3 2005/01/09 15:43:56 joff Exp $ */
-
-/*
- * Copyright (c) 2002 Dennis I. Chernoivanov
- * All rights reserved.
- *
- * 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. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 THE AUTHOR 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.
- */
-
-#ifndef _DEV_IC_HD44780_SUBR_H_
-#define _DEV_IC_HD44780_SUBR_H_
-
-/* IOCTL definitions */
-#define HLCD_DISPCTL _IOW('h', 1, struct hd44780_dispctl)
-#define HLCD_RESET _IO('h', 2)
-#define HLCD_CLEAR _IO('h', 3)
-#define HLCD_CURSOR_LEFT _IO('h', 4)
-#define HLCD_CURSOR_RIGHT _IO('h', 5)
-#define HLCD_GET_CURSOR_POS _IOR('h', 6, struct hd44780_io)
-#define HLCD_SET_CURSOR_POS _IOW('h', 7, struct hd44780_io)
-#define HLCD_GETC _IOR('h', 8, struct hd44780_io)
-#define HLCD_PUTC _IOW('h', 9, struct hd44780_io)
-#define HLCD_SHIFT_LEFT _IO('h', 10)
-#define HLCD_SHIFT_RIGHT _IO('h', 11)
-#define HLCD_HOME _IO('h', 12)
-#define HLCD_WRITE _IOWR('h', 13, struct hd44780_io)
-#define HLCD_READ _IOWR('h', 14, struct hd44780_io)
-#define HLCD_REDRAW _IOW('h', 15, struct hd44780_io)
-#define HLCD_WRITE_INST _IOW('h', 16, struct hd44780_io)
-#define HLCD_WRITE_DATA _IOW('h', 17, struct hd44780_io)
-#define HLCD_GET_INFO _IOR('h', 18, struct hd44780_info)
-
-struct hd44780_dispctl {
- u_char display_on:1,
- blink_on:1,
- cursor_on:1;
-};
-
-struct hd44780_io {
- u_int8_t dat;
- u_int8_t len;
- u_int8_t buf[HD_MAX_CHARS];
-};
-
-struct hd44780_info {
- u_char lines;
- u_char phys_rows;
- u_char virt_rows;
-
- u_char is_wide:1,
- is_bigfont:1,
- kp_present:1;
-};
-
-#ifdef _KERNEL
-
-/* HLCD driver structure */
-struct hd44780_chip {
-#define HD_8BIT 0x01 /* 8-bit if set, 4-bit otherwise */
-#define HD_MULTILINE 0x02 /* 2 lines if set, 1 otherwise */
-#define HD_BIGFONT 0x04 /* 5x10 if set, 5x8 otherwise */
-#define HD_KEYPAD 0x08 /* if set, keypad is connected */
-#define HD_UP 0x10 /* if set, lcd has been initialized */
-#define HD_TIMEDOUT 0x20 /* lcd has recently stopped talking */
- u_char sc_flags;
-
- u_char sc_rows; /* visible rows */
- u_char sc_vrows; /* virtual rows (normally 40) */
- u_char sc_dev_ok;
-
- bus_space_tag_t sc_iot;
-
- bus_space_handle_t sc_ioir; /* instruction register */
- bus_space_handle_t sc_iodr; /* data register */
-
- struct device *sc_dev; /* Pointer to parent device */
-
- /* Generic write/read byte entries. */
- void (* sc_writereg)(struct hd44780_chip *, u_int32_t, u_int8_t);
- u_int8_t (* sc_readreg)(struct hd44780_chip *, u_int32_t);
-};
-
-#define hd44780_ir_write(sc, dat) \
- do { \
- hd44780_busy_wait(sc); \
- (sc)->sc_writereg((sc), 0, (dat)); \
- } while(0)
-
-#define hd44780_ir_read(sc) \
- (sc)->sc_readreg((sc), 0)
-
-#define hd44780_dr_write(sc, dat) \
- (sc)->sc_writereg((sc), 1, (dat))
-
-#define hd44780_dr_read(sc) \
- (sc)->sc_readreg((sc), 1)
-
-void hd44780_attach_subr(struct hd44780_chip *);
-void hd44780_busy_wait(struct hd44780_chip *);
-int hd44780_init(struct hd44780_chip *);
-int hd44780_ioctl_subr(struct hd44780_chip *, u_long, caddr_t);
-void hd44780_ddram_redraw(struct hd44780_chip *, struct hd44780_io *);
-
-#define HD_DDRAM_READ 0x0
-#define HD_DDRAM_WRITE 0x1
-int hd44780_ddram_io(struct hd44780_chip *, struct hd44780_io *, u_char);
-
-#if defined(HD44780_STD_WIDE) || defined(HD44780_STD_SHORT)
-void hd44780_writereg(struct hd44780_chip *, u_int32_t, u_int8_t);
-u_int8_t hd44780_readreg(struct hd44780_chip *, u_int32_t);
-#endif
-
-#endif /* _KERNEL */
-
-#endif /* _DEV_IC_HD44780_SUBR_H_ */
diff -r 0101470ea1d9 -r 0d91a6b9cf9e sys/dev/ic/hd44780var.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/dev/ic/hd44780var.h Tue Jan 11 00:57:56 2005 +0000
@@ -0,0 +1,135 @@
+/* $NetBSD: hd44780var.h,v 1.1 2005/01/11 00:57:56 joff Exp $ */
+
+/*
+ * Copyright (c) 2002 Dennis I. Chernoivanov
+ * All rights reserved.
+ *
+ * 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. The name of the author may not be used to endorse or promote products
+ * derived from this software without specific prior written permission
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 THE AUTHOR 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.
+ */
+
+#ifndef _DEV_IC_HD44780VAR_H_
+#define _DEV_IC_HD44780VAR_H_
+
+/* IOCTL definitions */
+#define HLCD_DISPCTL _IOW('h', 1, struct hd44780_dispctl)
+#define HLCD_RESET _IO('h', 2)
+#define HLCD_CLEAR _IO('h', 3)
+#define HLCD_CURSOR_LEFT _IO('h', 4)
+#define HLCD_CURSOR_RIGHT _IO('h', 5)
+#define HLCD_GET_CURSOR_POS _IOR('h', 6, struct hd44780_io)
+#define HLCD_SET_CURSOR_POS _IOW('h', 7, struct hd44780_io)
+#define HLCD_GETC _IOR('h', 8, struct hd44780_io)
+#define HLCD_PUTC _IOW('h', 9, struct hd44780_io)
+#define HLCD_SHIFT_LEFT _IO('h', 10)
+#define HLCD_SHIFT_RIGHT _IO('h', 11)
+#define HLCD_HOME _IO('h', 12)
+#define HLCD_WRITE _IOWR('h', 13, struct hd44780_io)
+#define HLCD_READ _IOWR('h', 14, struct hd44780_io)
+#define HLCD_REDRAW _IOW('h', 15, struct hd44780_io)
+#define HLCD_WRITE_INST _IOW('h', 16, struct hd44780_io)
+#define HLCD_WRITE_DATA _IOW('h', 17, struct hd44780_io)
+#define HLCD_GET_INFO _IOR('h', 18, struct hd44780_info)
+
+struct hd44780_dispctl {
+ u_char display_on:1,
+ blink_on:1,
+ cursor_on:1;
+};
+
+struct hd44780_io {
+ u_int8_t dat;
+ u_int8_t len;
+ u_int8_t buf[HD_MAX_CHARS];
+};
+
+struct hd44780_info {
+ u_char lines;
+ u_char phys_rows;
+ u_char virt_rows;
+
+ u_char is_wide:1,
+ is_bigfont:1,
+ kp_present:1;
+};
+
+#ifdef _KERNEL
+
+/* HLCD driver structure */
+struct hd44780_chip {
+#define HD_8BIT 0x01 /* 8-bit if set, 4-bit otherwise */
+#define HD_MULTILINE 0x02 /* 2 lines if set, 1 otherwise */
+#define HD_BIGFONT 0x04 /* 5x10 if set, 5x8 otherwise */
+#define HD_KEYPAD 0x08 /* if set, keypad is connected */
+#define HD_UP 0x10 /* if set, lcd has been initialized */
+#define HD_TIMEDOUT 0x20 /* lcd has recently stopped talking */
+ u_char sc_flags;
+
+ u_char sc_rows; /* visible rows */
+ u_char sc_vrows; /* virtual rows (normally 40) */
+ u_char sc_dev_ok;
+
+ bus_space_tag_t sc_iot;
+
+ bus_space_handle_t sc_ioir; /* instruction register */
+ bus_space_handle_t sc_iodr; /* data register */
+
+ struct device *sc_dev; /* Pointer to parent device */
+
+ /* Generic write/read byte entries. */
+ void (* sc_writereg)(struct hd44780_chip *, u_int32_t, u_int8_t);
+ u_int8_t (* sc_readreg)(struct hd44780_chip *, u_int32_t);
+};
+
+#define hd44780_ir_write(sc, dat) \
+ do { \
+ hd44780_busy_wait(sc); \
Home |
Main Index |
Thread Index |
Old Index