Source-Changes-HG archive

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

[src/trunk]: src/sys/dev/sun avoid conflicts with our own ioctls



details:   https://anonhg.NetBSD.org/src/rev/74552c41f8de
branches:  trunk
changeset: 340721:74552c41f8de
user:      christos <christos%NetBSD.org@localhost>
date:      Sat Sep 26 03:31:52 2015 +0000

description:
avoid conflicts with our own ioctls

diffstat:

 sys/dev/sun/disklabel.h |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (22 lines):

diff -r cc59aefcdb77 -r 74552c41f8de sys/dev/sun/disklabel.h
--- a/sys/dev/sun/disklabel.h   Sat Sep 26 03:31:11 2015 +0000
+++ b/sys/dev/sun/disklabel.h   Sat Sep 26 03:31:52 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: disklabel.h,v 1.5 2015/09/06 06:01:01 dholland Exp $ */
+/*     $NetBSD: disklabel.h,v 1.6 2015/09/26 03:31:52 christos Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -49,9 +49,9 @@
 #define        SUN_DKMAGIC     55998
 
 /* These are the guys that Sun's dkinfo needs... */
-#define DKIOCGGEOM     _IOR('d', 2, struct sun_dkgeom) /* geometry info */
-#define DKIOCINFO      _IOR('d', 8, struct sun_dkctlr) /* controller info */
-#define DKIOCGPART     _IOR('d', 4, struct sun_dkpart) /* partition info */
+#define SUN_DKIOCGGEOM _IOR('d', 2, struct sun_dkgeom) /* geometry info */
+#define SUN_DKIOCINFO  _IOR('d', 8, struct sun_dkctlr) /* controller info */
+#define SUN_DKIOCGPART _IOR('d', 4, struct sun_dkpart) /* partition info */
 
 /* geometry info */
 struct sun_dkgeom {



Home | Main Index | Thread Index | Old Index