[Midnightbsd-cvs] src [10400] trunk/sys/sys: fix some definitions

[laffer1 at midnightbsd.org]

Revision: 10400
          http://svnweb.midnightbsd.org/src/?rev=10400
Author:   laffer1
Date:     2018-06-03 22:48:50 -0400 (Sun, 03 Jun 2018)
Log Message:
-----------
fix some definitions

Modified Paths:
--------------
    trunk/sys/sys/device_port.h
    trunk/sys/sys/mtio.h
    trunk/sys/sys/timex.h

Modified: trunk/sys/sys/device_port.h
===================================================================
--- trunk/sys/sys/device_port.h	2018-06-04 02:43:35 UTC (rev 10399)
+++ trunk/sys/sys/device_port.h	2018-06-04 02:48:50 UTC (rev 10400)
@@ -29,7 +29,7 @@
 
 #if defined(__NetBSD__)
 # include <sys/device.h>
-#elif defined(__FreeBSD__)
+#elif defined(__MidnightBSD__)
 # include <sys/module.h>
 # include <sys/bus.h>
 #endif
@@ -43,9 +43,9 @@
 # define DEVPORT_DEVNAME(dev)		(dev).dv_xname
 # define DEVPORT_DEVUNIT(dev)		(dev).dv_unit
 
-#elif defined(__FreeBSD__)
+#elif defined(__MidnightBSD__)
 /*
- * FreeBSD (compatibility for struct device)
+ * MidnightBSD (compatibility for struct device)
  */
 #define DEVPORT_DEVICE			device_t
 #define DEVPORT_DEVNAME(dev)		device_get_name(dev)
@@ -67,4 +67,4 @@
 #define DEVPORT_PDEVALLOC_SOFTC(pdev)	device_get_softc(pdev)
 #define DEVPORT_PDEVGET_SOFTC(pdev)	device_get_softc(pdev)
 
-#endif /* __FreeBSD__ */
+#endif /* __MidnightBSD__ */

Modified: trunk/sys/sys/mtio.h
===================================================================
--- trunk/sys/sys/mtio.h	2018-06-04 02:43:35 UTC (rev 10399)
+++ trunk/sys/sys/mtio.h	2018-06-04 02:48:50 UTC (rev 10400)
@@ -61,7 +61,7 @@
 #define MTCACHE		8	/* enable controller cache */
 #define MTNOCACHE	9	/* disable controller cache */
 
-#if defined(__FreeBSD__)
+#if defined(__MidnightBSD__)
 /* Set block size for device. If device is a variable size dev		*/
 /* a non zero parameter will change the device to a fixed block size	*/
 /* device with block size set to that of the parameter passed in.	*/
@@ -106,7 +106,7 @@
 #define	MTIO_DSREG_UNL	45	/* Unloading */
 #define	MTIO_DSREG_LD	46	/* Loading */
 
-#endif	/* __FreeBSD__ */
+#endif	/* __MidnightBSD__ */
 
 /* structure for MTIOCGET - mag tape get status command */
 
@@ -123,7 +123,7 @@
 	 * more accurate count.
 	 */
 	short	mt_resid;	/* residual count */
-#if defined (__FreeBSD__)
+#if defined (__MidnightBSD__)
 	int32_t mt_blksiz;	/* presently operating blocksize */
 	int32_t mt_density;	/* presently operating density */
 	u_int32_t mt_comp;	/* presently operating compression */

Modified: trunk/sys/sys/timex.h
===================================================================
--- trunk/sys/sys/timex.h	2018-06-04 02:43:35 UTC (rev 10399)
+++ trunk/sys/sys/timex.h	2018-06-04 02:48:50 UTC (rev 10400)
@@ -98,9 +98,9 @@
 #define _SYS_TIMEX_H_ 1
 #define NTP_API		4	/* NTP API version */
 
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
 #include <sys/_timespec.h>
-#endif /* __FreeBSD__ */
+#endif /* __MidnightBSD__ */
 #ifndef MSDOS			/* Microsoft specific */
 #include <sys/syscall.h>
 #endif /* MSDOS */
@@ -222,7 +222,7 @@
 	long	stbcnt;		/* stability limit exceeded (ro) */
 };
 
-#ifdef __FreeBSD__
+#ifdef __MidnightBSD__
 
 #ifdef _KERNEL
 void	ntp_update_second(int64_t *adjustment, time_t *newsec);
@@ -235,6 +235,6 @@
 __END_DECLS
 #endif /* _KERNEL */
 
-#endif /* __FreeBSD__ */
+#endif /* __MidnightBSD__ */
 
 #endif /* !_SYS_TIMEX_H_ */