Replace all remaining instances of i386/include' by machine' and fix

nearby #include inconsistencies.
This commit is contained in:
Bruce Evans 1995-02-26 05:14:53 +00:00
parent c5489d9047
commit 550f8550ec
18 changed files with 141 additions and 164 deletions

View File

@ -39,7 +39,7 @@
* SUCH DAMAGE.
*
* from: @(#)pmap.c 7.7 (Berkeley) 5/12/91
* $Id: pmap.c,v 1.48 1995/02/02 08:45:14 davidg Exp $
* $Id: pmap.c,v 1.49 1995/02/15 04:36:31 davidg Exp $
*/
/*
@ -95,7 +95,7 @@
#include <vm/vm_kern.h>
#include <vm/vm_page.h>
#include <i386/include/cputypes.h>
#include <machine/cputypes.h>
#include <i386/isa/isa.h>

View File

@ -1,6 +1,6 @@
/**************************************************************************
**
** $Id: pcibus.c,v 1.2 1995/02/09 20:16:19 se Exp $
** $Id: pcibus.c,v 1.3 1995/02/25 17:51:18 se Exp $
**
** pci bus subroutines for i386 architecture.
**
@ -45,23 +45,18 @@
#define HAS_CPUFUNC_H
#endif
#include <types.h>
#include <param.h>
#include <kernel.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <i386/isa/icu.h>
#include <i386/isa/isa.h>
#include <i386/isa/isa_device.h>
#include <i386/isa/icu.h>
#ifdef HAS_CPUFUNC_H
#include <i386/include/cpufunc.h>
#endif
#include <pci/pcivar.h>
#include <pci/pcireg.h>
#include <pci/pcibus.h>
extern int printf();
static char pci_mode;
/*-----------------------------------------------------------------

View File

@ -1,6 +1,6 @@
/**************************************************************************
**
** $Id: pcibus.c,v 1.2 1995/02/09 20:16:19 se Exp $
** $Id: pcibus.c,v 1.3 1995/02/25 17:51:18 se Exp $
**
** pci bus subroutines for i386 architecture.
**
@ -45,23 +45,18 @@
#define HAS_CPUFUNC_H
#endif
#include <types.h>
#include <param.h>
#include <kernel.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <i386/isa/icu.h>
#include <i386/isa/isa.h>
#include <i386/isa/isa_device.h>
#include <i386/isa/icu.h>
#ifdef HAS_CPUFUNC_H
#include <i386/include/cpufunc.h>
#endif
#include <pci/pcivar.h>
#include <pci/pcireg.h>
#include <pci/pcibus.h>
extern int printf();
static char pci_mode;
/*-----------------------------------------------------------------

View File

@ -31,13 +31,15 @@
#if NJOY > 0
#include <errno.h>
#include <sys/types.h>
#include <i386/isa/isa.h>
#include <i386/isa/timerreg.h>
#include <i386/isa/isa_device.h>
#include <machine/cpufunc.h>
#include <i386/include/joystick.h>
#include <sys/types.h>
#include <machine/cpufunc.h>
#include <machine/joystick.h>
#include <i386/isa/isa.h>
#include <i386/isa/isa_device.h>
#include <i386/isa/timerreg.h>
/* The game port can manage 4 buttons and 4 variable resistors (usually 2
* joysticks, each with 2 buttons and 2 pots.) via the port at address 0x201.

View File

@ -39,7 +39,7 @@
* SUCH DAMAGE.
*
* from: @(#)pmap.c 7.7 (Berkeley) 5/12/91
* $Id: pmap.c,v 1.48 1995/02/02 08:45:14 davidg Exp $
* $Id: pmap.c,v 1.49 1995/02/15 04:36:31 davidg Exp $
*/
/*
@ -95,7 +95,7 @@
#include <vm/vm_kern.h>
#include <vm/vm_page.h>
#include <i386/include/cputypes.h>
#include <machine/cputypes.h>
#include <i386/isa/isa.h>

View File

@ -26,7 +26,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: elink.c,v 1.2 1994/09/16 13:33:35 davidg Exp $
* $Id: elink.c,v 1.3 1994/09/17 16:51:47 se Exp $
*/
/*
@ -35,8 +35,10 @@
#include <sys/types.h>
#include <sys/cdefs.h>
#include <machine/cpufunc.h>
#include <i386/isa/elink.h>
#include <i386/include/cpufunc.h>
/*
* Issue a `global reset' to all cards. We have to be careful to do this only

View File

@ -35,23 +35,23 @@
#include "gsc.h"
#if NGSC > 0
#include "param.h"
#include "systm.h"
#include "proc.h"
#include "user.h"
#include "buf.h"
#include "malloc.h"
#include "kernel.h"
#include "ioctl.h"
#include "tty.h"
#include "uio.h"
#include "syslog.h"
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/proc.h>
#include <sys/user.h>
#include <sys/buf.h>
#include <sys/malloc.h>
#include <sys/kernel.h>
#include <sys/ioctl.h>
#include <sys/tty.h>
#include <sys/uio.h>
#include <sys/syslog.h>
#include "i386/isa/isa.h"
#include "i386/isa/isa_device.h"
#include "i386/isa/gscreg.h"
#include <machine/gsc.h>
#include "i386/include/gsc.h"
#include <i386/isa/isa.h>
#include <i386/isa/isa_device.h>
#include <i386/isa/gscreg.h>
/***********************************************************************
*

View File

@ -47,53 +47,53 @@
*/
/*
* $Id: if_ze.c,v 1.10 1995/01/23 18:02:32 phk Exp $
* $Id: if_ze.c,v 1.11 1995/02/17 02:22:51 phk Exp $
*/
#include "ze.h"
#if NZE > 0
#include "bpfilter.h"
#include "param.h"
#include "systm.h"
#include "errno.h"
#include "ioctl.h"
#include "mbuf.h"
#include "socket.h"
#include "syslog.h"
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/errno.h>
#include <sys/ioctl.h>
#include <sys/mbuf.h>
#include <sys/socket.h>
#include <sys/syslog.h>
#include "net/if.h"
#include "net/if_dl.h"
#include "net/if_types.h"
#include "net/netisr.h"
#include <net/if.h>
#include <net/if_dl.h>
#include <net/if_types.h>
#include <net/netisr.h>
#ifdef INET
#include "netinet/in.h"
#include "netinet/in_systm.h"
#include "netinet/in_var.h"
#include "netinet/ip.h"
#include "netinet/if_ether.h"
#include <netinet/in.h>
#include <netinet/in_systm.h>
#include <netinet/in_var.h>
#include <netinet/ip.h>
#include <netinet/if_ether.h>
#endif
#ifdef NS
#include "netns/ns.h"
#include "netns/ns_if.h"
#include <netns/ns.h>
#include <netns/ns_if.h>
#endif
#if NBPFILTER > 0
#include "net/bpf.h"
#include "net/bpfdesc.h"
#include <net/bpf.h>
#include <net/bpfdesc.h>
#endif
#include "i386/isa/isa.h"
#include "i386/isa/isa_device.h"
#include "i386/isa/icu.h"
#include "i386/isa/if_zereg.h"
#include "i386/isa/pcic.h"
#include <i386/isa/isa.h>
#include <i386/isa/isa_device.h>
#include <i386/isa/icu.h>
#include <i386/isa/if_zereg.h>
#include <i386/isa/pcic.h>
#include "apm.h"
#if NAPM > 0
#include "i386/include/apm_bios.h"
#include <machine/apm_bios.h>
#endif /* NAPM > 0 */

View File

@ -35,7 +35,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* From: if_ep.c,v 1.9 1994/01/25 10:46:29 deraadt Exp $
* $Id: if_ep.c,v 1.9 1994/05/02 22:27:33 ats Exp $
* $Id: if_zp.c,v 1.1 1995/02/17 02:22:52 phk Exp $
*/
/*-
* TODO:
@ -183,7 +183,7 @@ enum memtype { COMMON, ATTRIBUTE };
#include "apm.h"
#if NAPM > 0
#include "i386/include/apm_bios.h"
#include <machine/apm_bios.h>
#endif /* NAPM > 0 */
#endif /* MACH_KERNEL */
@ -258,13 +258,13 @@ static unsigned char card_info[256];
int zpprobe __P((struct isa_device *));
int zpattach __P((struct isa_device *));
int zpioctl __P((struct ifnet * ifp, int, caddr_t));
static int zpioctl __P((struct ifnet * ifp, int, caddr_t));
static u_short read_eeprom_data __P((int, int));
void zpinit __P((int));
void zpintr __P((int));
void zpmbuffill __P((caddr_t));
void zpmbufempty __P((struct zp_softc *));
void zpmbuffill __P((void *));
static void zpmbufempty __P((struct zp_softc *));
void zpread __P((struct zp_softc *));
void zpreset __P((int));
void zpstart __P((struct ifnet *));
@ -1106,7 +1106,7 @@ zpinit(unit)
*/
sc->last_mb = 0;
sc->next_mb = 0;
zpmbuffill((caddr_t)sc);
zpmbuffill(sc);
#endif /* MACH_KERNEL */
#ifdef MACH_KERNEL
#if 0 /* seiji */
@ -1767,7 +1767,7 @@ zpread(sc)
if (m == 0)
goto out;
} else {
timeout(zpmbuffill, (caddr_t)sc, 0);
timeout(zpmbuffill, sc, 0);
sc->next_mb = (sc->next_mb + 1) % MAX_MBS;
}
if (totlen >= MINCLSIZE)
@ -2217,7 +2217,7 @@ f_is_eeprom_busy(is)
#ifndef MACH_KERNEL
void
zpmbuffill(sp)
caddr_t sp;
void *sp;
{
struct zp_softc *sc = (struct zp_softc *)sp;
int s, i;

View File

@ -31,13 +31,15 @@
#if NJOY > 0
#include <errno.h>
#include <sys/types.h>
#include <i386/isa/isa.h>
#include <i386/isa/timerreg.h>
#include <i386/isa/isa_device.h>
#include <machine/cpufunc.h>
#include <i386/include/joystick.h>
#include <sys/types.h>
#include <machine/cpufunc.h>
#include <machine/joystick.h>
#include <i386/isa/isa.h>
#include <i386/isa/isa_device.h>
#include <i386/isa/timerreg.h>
/* The game port can manage 4 buttons and 4 variable resistors (usually 2
* joysticks, each with 2 buttons and 2 pots.) via the port at address 0x201.

View File

@ -46,7 +46,7 @@
* SUCH DAMAGE.
*
* from: unknown origin, 386BSD 0.1
* $Id: lpt.c,v 1.23 1994/11/13 21:14:30 nate Exp $
* $Id: lpt.c,v 1.24 1994/11/16 06:09:29 phk Exp $
*/
/*
@ -114,12 +114,12 @@
#include <sys/syslog.h>
#include <sys/devconf.h>
#include <machine/lpt.h>
#include <i386/isa/isa.h>
#include <i386/isa/isa_device.h>
#include <i386/isa/lptreg.h>
#include <i386/include/lpt.h>
#ifdef INET
#include <sys/mbuf.h>
#include <sys/socket.h>

View File

@ -1,6 +1,6 @@
/**************************************************************************
**
** $Id: pcibus.c,v 1.2 1995/02/09 20:16:19 se Exp $
** $Id: pcibus.c,v 1.3 1995/02/25 17:51:18 se Exp $
**
** pci bus subroutines for i386 architecture.
**
@ -45,23 +45,18 @@
#define HAS_CPUFUNC_H
#endif
#include <types.h>
#include <param.h>
#include <kernel.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <i386/isa/icu.h>
#include <i386/isa/isa.h>
#include <i386/isa/isa_device.h>
#include <i386/isa/icu.h>
#ifdef HAS_CPUFUNC_H
#include <i386/include/cpufunc.h>
#endif
#include <pci/pcivar.h>
#include <pci/pcireg.h>
#include <pci/pcibus.h>
extern int printf();
static char pci_mode;
/*-----------------------------------------------------------------

View File

@ -49,24 +49,24 @@
#if NPSM > 0
#include <param.h>
#include <kernel.h>
#include <systm.h>
#include <buf.h>
#include <malloc.h>
#include <ioctl.h>
#include <tty.h>
#include <file.h>
#include <proc.h>
#include <vnode.h>
#include <i386/include/mouse.h>
#include <i386/isa/isa_device.h>
#ifdef 0
#include "syslog.h" /* For debugging */
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/buf.h>
#include <sys/malloc.h>
#include <sys/ioctl.h>
#include <sys/tty.h>
#include <sys/file.h>
#include <sys/proc.h>
#include <sys/vnode.h>
#if 0
#include <sys/syslog.h> /* For debugging */
#endif
#include <machine/mouse.h>
#include <i386/isa/isa_device.h>
#define DATA 0 /* Offset for data port, read-write */
#define CNTRL 4 /* Offset for control port, write-only */
#define STATUS 4 /* Offset for status port, read-only */

View File

@ -48,24 +48,23 @@ error "Can only have 1 spigot configured."
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/ioctl.h>
#include <sys/proc.h>
#include <sys/user.h>
#include <sys/file.h>
#include <sys/uio.h>
#include <sys/kernel.h>
#include <sys/malloc.h>
#include <sys/devconf.h>
#include <sys/errno.h>
#include <sys/mman.h>
#include <machine/spigot.h>
#include <machine/psl.h>
#include <i386/isa/isa.h>
#include <i386/isa/isa_device.h>
#include <i386/include/spigot.h>
#include <i386/include/psl.h>
struct spigot_softc {
int flags;
caddr_t maddr;

View File

@ -1,6 +1,6 @@
/**************************************************************************
**
** $Id: pcibus.c,v 1.2 1995/02/09 20:16:19 se Exp $
** $Id: pcibus.c,v 1.3 1995/02/25 17:51:18 se Exp $
**
** pci bus subroutines for i386 architecture.
**
@ -45,23 +45,18 @@
#define HAS_CPUFUNC_H
#endif
#include <types.h>
#include <param.h>
#include <kernel.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <i386/isa/icu.h>
#include <i386/isa/isa.h>
#include <i386/isa/isa_device.h>
#include <i386/isa/icu.h>
#ifdef HAS_CPUFUNC_H
#include <i386/include/cpufunc.h>
#endif
#include <pci/pcivar.h>
#include <pci/pcireg.h>
#include <pci/pcibus.h>
extern int printf();
static char pci_mode;
/*-----------------------------------------------------------------

View File

@ -1,6 +1,6 @@
/**************************************************************************
**
** $Id: pcibus.c,v 1.2 1995/02/09 20:16:19 se Exp $
** $Id: pcibus.c,v 1.3 1995/02/25 17:51:18 se Exp $
**
** pci bus subroutines for i386 architecture.
**
@ -45,23 +45,18 @@
#define HAS_CPUFUNC_H
#endif
#include <types.h>
#include <param.h>
#include <kernel.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <i386/isa/icu.h>
#include <i386/isa/isa.h>
#include <i386/isa/isa_device.h>
#include <i386/isa/icu.h>
#ifdef HAS_CPUFUNC_H
#include <i386/include/cpufunc.h>
#endif
#include <pci/pcivar.h>
#include <pci/pcireg.h>
#include <pci/pcibus.h>
extern int printf();
static char pci_mode;
/*-----------------------------------------------------------------

View File

@ -1,6 +1,6 @@
/**************************************************************************
**
** $Id: pcibus.c,v 1.2 1995/02/09 20:16:19 se Exp $
** $Id: pcibus.c,v 1.3 1995/02/25 17:51:18 se Exp $
**
** pci bus subroutines for i386 architecture.
**
@ -45,23 +45,18 @@
#define HAS_CPUFUNC_H
#endif
#include <types.h>
#include <param.h>
#include <kernel.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <i386/isa/icu.h>
#include <i386/isa/isa.h>
#include <i386/isa/isa_device.h>
#include <i386/isa/icu.h>
#ifdef HAS_CPUFUNC_H
#include <i386/include/cpufunc.h>
#endif
#include <pci/pcivar.h>
#include <pci/pcireg.h>
#include <pci/pcibus.h>
extern int printf();
static char pci_mode;
/*-----------------------------------------------------------------

View File

@ -31,13 +31,15 @@
#if NJOY > 0
#include <errno.h>
#include <sys/types.h>
#include <i386/isa/isa.h>
#include <i386/isa/timerreg.h>
#include <i386/isa/isa_device.h>
#include <machine/cpufunc.h>
#include <i386/include/joystick.h>
#include <sys/types.h>
#include <machine/cpufunc.h>
#include <machine/joystick.h>
#include <i386/isa/isa.h>
#include <i386/isa/isa_device.h>
#include <i386/isa/timerreg.h>
/* The game port can manage 4 buttons and 4 variable resistors (usually 2
* joysticks, each with 2 buttons and 2 pots.) via the port at address 0x201.