svn commit: r359181 - in head/sys/dev: ce cp cx

Ed Maste emaste at FreeBSD.org
Fri Mar 20 19:28:57 UTC 2020 

Author: emaste
Date: Fri Mar 20 19:28:55 2020
New Revision: 359181
URL: https://svnweb.freebsd.org/changeset/base/359181

Log:
  Use a separate copy of machdep.h in cp and ce drivers
  
  Previously they included sys/dev/cx/machdep.h, but the cx driver was
  retired in r359178.  These drivers haven't had real development for
  a decade or more so there's no real benefit in sharing this file; just
  copy it to the ce and cp subdirs.

Added:
  head/sys/dev/ce/machdep.h
     - copied unchanged from r359180, head/sys/dev/cx/machdep.h
  head/sys/dev/cp/machdep.h
     - copied unchanged from r359180, head/sys/dev/cx/machdep.h
Deleted:
  head/sys/dev/cx/
Modified:
  head/sys/dev/ce/ceddk.c
  head/sys/dev/ce/if_ce.c
  head/sys/dev/cp/cpddk.c
  head/sys/dev/cp/if_cp.c

Modified: head/sys/dev/ce/ceddk.c
==============================================================================
--- head/sys/dev/ce/ceddk.c	Fri Mar 20 19:23:55 2020	(r359180)
+++ head/sys/dev/ce/ceddk.c	Fri Mar 20 19:28:55 2020	(r359181)
@@ -18,7 +18,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <dev/cx/machdep.h>
+#include <dev/ce/machdep.h>
 #include <dev/ce/ceddk.h>
 
 #undef CE_DDK_DEBUG_ENABLED

Modified: head/sys/dev/ce/if_ce.c
==============================================================================
--- head/sys/dev/ce/if_ce.c	Fri Mar 20 19:23:55 2020	(r359180)
+++ head/sys/dev/ce/if_ce.c	Fri Mar 20 19:28:55 2020	(r359181)
@@ -72,7 +72,7 @@ __FBSDID("$FreeBSD$");
 #   define PP_CISCO IFF_LINK2
 #   include <net/bpf.h>
 #endif
-#include <dev/cx/machdep.h>
+#include <dev/ce/machdep.h>
 #include <dev/ce/ceddk.h>
 #include <machine/cserial.h>
 #include <machine/resource.h>

Copied: head/sys/dev/ce/machdep.h (from r359180, head/sys/dev/cx/machdep.h)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sys/dev/ce/machdep.h	Fri Mar 20 19:28:55 2020	(r359181, copy of r359180, head/sys/dev/cx/machdep.h)
@@ -0,0 +1,97 @@
+/*-
+ * Cronyx DDK: platform dependent definitions.
+ *
+ * Copyright (C) 1998-1999 Cronyx Engineering
+ * Author: Alexander Kvitchenko, <aak at cronyx.ru>
+ *
+ * Copyright (C) 2001-2003 Cronyx Engineering.
+ * Author: Roman Kurakin, <rik at cronyx.ru>
+ *
+ * This software is distributed with NO WARRANTIES, not even the implied
+ * warranties for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * Authors grant any other persons or organisations permission to use
+ * or modify this software as long as this message is kept with the software,
+ * all derivative works or modified versions.
+ *
+ * Cronyx Id: machdep.h,v 1.3.4.3 2003/11/27 14:21:58 rik Exp $
+ * $FreeBSD$
+ */
+
+/*
+ * DOS (Borland Turbo C++ 1.0)
+ */
+#if defined (MSDOS) || defined (__MSDOS__)
+#   include <dos.h>
+#   include <string.h>
+#   define inb(port)		inportb(port)
+#   define inw(port)		inport(port)
+#   define outb(port,b)		outportb(port,b)
+#   define outw(port,w)		outport(port,w)
+#   define GETTICKS()		biostime(0,0L)
+#else
+
+/*
+ * Windows NT
+ */
+#ifdef NDIS_MINIPORT_DRIVER
+#   include <string.h>
+#   define inb(port)		inp((unsigned short)(port))
+#   define inw(port)		inpw((unsigned short)(port))
+#   define outb(port,b)		outp((unsigned short)(port),b)
+#   define outw(port,w)		outpw((unsigned short)(port),(unsigned short)(w))
+#pragma warning (disable: 4761)
+#pragma warning (disable: 4242)
+#pragma warning (disable: 4244)
+#define ulong64			unsigned __int64
+#else
+
+/*
+ * Linux
+ */
+#ifdef __linux__
+#   undef REALLY_SLOW_IO
+#   include <asm/io.h>		/* should swap outb() arguments */
+#   include <linux/string.h>
+#   include <linux/delay.h>
+    static inline void __ddk_outb (unsigned port, unsigned char byte)
+    { outb (byte, port); }
+    static inline void __ddk_outw (unsigned port, unsigned short word)
+    { outw (word, port); }
+#   undef outb
+#   undef outw
+#   define outb(port,val)	__ddk_outb(port, val)
+#   define outw(port,val)	__ddk_outw(port, val)
+#   define GETTICKS()		(jiffies * 200 / 11 / HZ)
+#else
+
+/*
+ * FreeBSD and BSD/OS
+ */
+#ifdef __FreeBSD__
+#   include <sys/param.h>
+#   include <machine/cpufunc.h>
+#   include <sys/libkern.h>
+#   include <sys/systm.h>
+#   define port_t int
+
+#ifndef _SYS_CDEFS_H_
+#error this file needs sys/cdefs.h as a prerequisite
+#endif
+#endif
+
+#endif
+#endif
+#endif
+
+#ifndef inline
+#   ifdef __CC_SUPPORTS___INLINE__
+#      define inline __inline__
+#   else
+#      define inline /**/
+#   endif
+#endif
+
+#ifndef ulong64
+#define ulong64 unsigned long long
+#endif

Modified: head/sys/dev/cp/cpddk.c
==============================================================================
--- head/sys/dev/cp/cpddk.c	Fri Mar 20 19:23:55 2020	(r359180)
+++ head/sys/dev/cp/cpddk.c	Fri Mar 20 19:28:55 2020	(r359181)
@@ -20,7 +20,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <dev/cx/machdep.h>
+#include <dev/cp/machdep.h>
 
 #define CPDDK_COBF_SAFE
 #include <dev/cp/cpddk.h>

Modified: head/sys/dev/cp/if_cp.c
==============================================================================
--- head/sys/dev/cp/if_cp.c	Fri Mar 20 19:23:55 2020	(r359180)
+++ head/sys/dev/cp/if_cp.c	Fri Mar 20 19:28:55 2020	(r359181)
@@ -63,7 +63,7 @@ __FBSDID("$FreeBSD$");
 #   define PP_CISCO IFF_LINK2
 #   include <net/bpf.h>
 #endif
-#include <dev/cx/machdep.h>
+#include <dev/cp/machdep.h>
 #include <dev/cp/cpddk.h>
 #include <machine/cserial.h>
 #include <machine/resource.h>

Copied: head/sys/dev/cp/machdep.h (from r359180, head/sys/dev/cx/machdep.h)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sys/dev/cp/machdep.h	Fri Mar 20 19:28:55 2020	(r359181, copy of r359180, head/sys/dev/cx/machdep.h)
@@ -0,0 +1,97 @@
+/*-
+ * Cronyx DDK: platform dependent definitions.
+ *
+ * Copyright (C) 1998-1999 Cronyx Engineering
+ * Author: Alexander Kvitchenko, <aak at cronyx.ru>
+ *
+ * Copyright (C) 2001-2003 Cronyx Engineering.
+ * Author: Roman Kurakin, <rik at cronyx.ru>
+ *
+ * This software is distributed with NO WARRANTIES, not even the implied
+ * warranties for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * Authors grant any other persons or organisations permission to use
+ * or modify this software as long as this message is kept with the software,
+ * all derivative works or modified versions.
+ *
+ * Cronyx Id: machdep.h,v 1.3.4.3 2003/11/27 14:21:58 rik Exp $
+ * $FreeBSD$
+ */
+
+/*
+ * DOS (Borland Turbo C++ 1.0)
+ */
+#if defined (MSDOS) || defined (__MSDOS__)
+#   include <dos.h>
+#   include <string.h>
+#   define inb(port)		inportb(port)
+#   define inw(port)		inport(port)
+#   define outb(port,b)		outportb(port,b)
+#   define outw(port,w)		outport(port,w)
+#   define GETTICKS()		biostime(0,0L)
+#else
+
+/*
+ * Windows NT
+ */
+#ifdef NDIS_MINIPORT_DRIVER
+#   include <string.h>
+#   define inb(port)		inp((unsigned short)(port))
+#   define inw(port)		inpw((unsigned short)(port))
+#   define outb(port,b)		outp((unsigned short)(port),b)
+#   define outw(port,w)		outpw((unsigned short)(port),(unsigned short)(w))
+#pragma warning (disable: 4761)
+#pragma warning (disable: 4242)
+#pragma warning (disable: 4244)
+#define ulong64			unsigned __int64
+#else
+
+/*
+ * Linux
+ */
+#ifdef __linux__
+#   undef REALLY_SLOW_IO
+#   include <asm/io.h>		/* should swap outb() arguments */
+#   include <linux/string.h>
+#   include <linux/delay.h>
+    static inline void __ddk_outb (unsigned port, unsigned char byte)
+    { outb (byte, port); }
+    static inline void __ddk_outw (unsigned port, unsigned short word)
+    { outw (word, port); }
+#   undef outb
+#   undef outw
+#   define outb(port,val)	__ddk_outb(port, val)
+#   define outw(port,val)	__ddk_outw(port, val)
+#   define GETTICKS()		(jiffies * 200 / 11 / HZ)
+#else
+
+/*
+ * FreeBSD and BSD/OS
+ */
+#ifdef __FreeBSD__
+#   include <sys/param.h>
+#   include <machine/cpufunc.h>
+#   include <sys/libkern.h>
+#   include <sys/systm.h>
+#   define port_t int
+
+#ifndef _SYS_CDEFS_H_
+#error this file needs sys/cdefs.h as a prerequisite
+#endif
+#endif
+
+#endif
+#endif
+#endif
+
+#ifndef inline
+#   ifdef __CC_SUPPORTS___INLINE__
+#      define inline __inline__
+#   else
+#      define inline /**/
+#   endif
+#endif
+
+#ifndef ulong64
+#define ulong64 unsigned long long
+#endif

More information about the svn-src-head mailing list