Module Name: src
Committed By: tsutsui
Date: Sun Jun 29 04:08:43 UTC 2014
Modified Files:
src/sys/dev/ic: sti.c stivar.h
Log Message:
Export accessops functions to allow overriding them in MD attachment.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/dev/ic/sti.c
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/ic/stivar.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/ic/sti.c
diff -u src/sys/dev/ic/sti.c:1.17 src/sys/dev/ic/sti.c:1.18
--- src/sys/dev/ic/sti.c:1.17 Sun Apr 20 04:12:54 2014
+++ src/sys/dev/ic/sti.c Sun Jun 29 04:08:43 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: sti.c,v 1.17 2014/04/20 04:12:54 tsutsui Exp $ */
+/* $NetBSD: sti.c,v 1.18 2014/06/29 04:08:43 tsutsui Exp $ */
/* $OpenBSD: sti.c,v 1.61 2009/09/05 14:09:35 miod Exp $ */
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sti.c,v 1.17 2014/04/20 04:12:54 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sti.c,v 1.18 2014/06/29 04:08:43 tsutsui Exp $");
#include "wsdisplay.h"
@@ -90,14 +90,6 @@ struct wsdisplay_emulops sti_emulops = {
sti_alloc_attr
};
-int sti_ioctl(void *, void *, u_long, void *, int, struct lwp *);
-paddr_t sti_mmap(void *, void *, off_t, int);
-int sti_alloc_screen(void *, const struct wsscreen_descr *,
- void **, int *, int *, long *);
- void sti_free_screen(void *, void *);
-int sti_show_screen(void *, void *, int, void (*cb)(void *, int, int), void *);
-int sti_load_font(void *, void *, struct wsdisplay_font *);
-
const struct wsdisplay_accessops sti_accessops = {
sti_ioctl,
sti_mmap,
Index: src/sys/dev/ic/stivar.h
diff -u src/sys/dev/ic/stivar.h:1.8 src/sys/dev/ic/stivar.h:1.9
--- src/sys/dev/ic/stivar.h:1.8 Sun Apr 20 04:12:54 2014
+++ src/sys/dev/ic/stivar.h Sun Jun 29 04:08:43 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: stivar.h,v 1.8 2014/04/20 04:12:54 tsutsui Exp $ */
+/* $NetBSD: stivar.h,v 1.9 2014/06/29 04:08:43 tsutsui Exp $ */
/* $OpenBSD: stivar.h,v 1.24 2009/02/06 22:51:04 miod Exp $ */
@@ -131,6 +131,15 @@ void sti_describe(struct sti_softc *);
void sti_end_attach(struct sti_softc *);
u_int sti_rom_size(bus_space_tag_t, bus_space_handle_t);
+int sti_ioctl(void *, void *, u_long, void *, int, struct lwp *);
+paddr_t sti_mmap(void *, void *, off_t, int);
+int sti_alloc_screen(void *, const struct wsscreen_descr *,
+ void **, int *, int *, long *);
+void sti_free_screen(void *, void *);
+int sti_show_screen(void *, void *, int, void (*cb)(void *, int, int),
+ void *);
+int sti_load_font(void *, void *, struct wsdisplay_font *);
+
int sti_cnattach(struct sti_rom *, struct sti_screen *, bus_space_tag_t,
bus_addr_t *, u_int);
