Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/compat/netbsd32 Support WSDISPLAYIO_GETCMAP/WSDISPLAYIO_...



details:   https://anonhg.NetBSD.org/src/rev/00d1072a6fd3
branches:  trunk
changeset: 326281:00d1072a6fd3
user:      bouyer <bouyer%NetBSD.org@localhost>
date:      Fri Jan 24 12:16:10 2014 +0000

description:
Support WSDISPLAYIO_GETCMAP/WSDISPLAYIO_PUTCMAP. Tested on evbmips/loongson

diffstat:

 sys/compat/netbsd32/netbsd32_ioctl.c |  33 +++++++++++++++++++++++++++++++--
 1 files changed, 31 insertions(+), 2 deletions(-)

diffs (68 lines):

diff -r a7f7eb82d7f5 -r 00d1072a6fd3 sys/compat/netbsd32/netbsd32_ioctl.c
--- a/sys/compat/netbsd32/netbsd32_ioctl.c      Fri Jan 24 12:11:40 2014 +0000
+++ b/sys/compat/netbsd32/netbsd32_ioctl.c      Fri Jan 24 12:16:10 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: netbsd32_ioctl.c,v 1.68 2014/01/24 10:41:07 manu Exp $ */
+/*     $NetBSD: netbsd32_ioctl.c,v 1.69 2014/01/24 12:16:10 bouyer Exp $       */
 
 /*
  * Copyright (c) 1998, 2001 Matthew R. Green
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_ioctl.c,v 1.68 2014/01/24 10:41:07 manu Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_ioctl.c,v 1.69 2014/01/24 12:16:10 bouyer Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -335,6 +335,18 @@
 }
 
 static inline void
+netbsd32_to_wsdisplay_cmap(struct netbsd32_wsdisplay_cmap *c32,
+                                              struct wsdisplay_cmap *c,
+                                              u_long cmd)
+{
+       c->index = c32->index;
+       c->count = c32->count;
+       c->red   = NETBSD32PTR64(c32->red);
+       c->green = NETBSD32PTR64(c32->green);
+       c->blue  = NETBSD32PTR64(c32->blue);
+}
+
+static inline void
 netbsd32_to_clockctl_settimeofday(
     const struct netbsd32_clockctl_settimeofday *s32p,
     struct clockctl_settimeofday *p,
@@ -593,6 +605,18 @@
 }
 
 static inline void
+netbsd32_from_wsdisplay_cmap(struct wsdisplay_cmap *c,
+                                          struct netbsd32_wsdisplay_cmap *c32,
+                                          u_long cmd)
+{
+       c32->index = c->index;
+       c32->count = c->count;
+       NETBSD32PTR32(c32->red, c->red);
+       NETBSD32PTR32(c32->green, c->green);
+       NETBSD32PTR32(c32->blue, c->blue);
+}
+
+static inline void
 netbsd32_from_ieee80211req(struct ieee80211req *ireq,
                           struct netbsd32_ieee80211req *ireq32, u_long cmd)
 {
@@ -1011,6 +1035,11 @@
        case WSDISPLAYIO_SCURSOR32:
                IOCTL_STRUCT_CONV_TO(WSDISPLAYIO_SCURSOR, wsdisplay_cursor);
 
+       case WSDISPLAYIO_GETCMAP32:
+               IOCTL_STRUCT_CONV_TO(WSDISPLAYIO_GETCMAP, wsdisplay_cmap);
+       case WSDISPLAYIO_PUTCMAP32:
+               IOCTL_STRUCT_CONV_TO(WSDISPLAYIO_PUTCMAP, wsdisplay_cmap);
+
        case SIOCS8021132:
                IOCTL_STRUCT_CONV_TO(SIOCS80211, ieee80211req);
        case SIOCG8021132:



Home | Main Index | Thread Index | Old Index