d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reviewed by: se

Browse Source 
Submitted by:	wolf (Wolfgang Stanglmeier)
PCI specific code moved to /sys/pci.
This commit is contained in:
Stefan Eßer 1995-02-01 23:11:38 +00:00
parent ac19f91802
commit fe90a500af
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=6105
2 changed files with 32 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
sys/amd64/amd64/autoconf.c
View File

@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)autoconf.c 7.1 (Berkeley) 5/9/91
* $Id: autoconf.c,v 1.17 1994/12/31 17:11:59 jkh Exp $
* $Id: autoconf.c,v 1.18 1995/01/11 17:51:26 jkh Exp $
*/
/*
@ -75,6 +75,16 @@ int ffs_mountroot __P((void));
int nfs_mountroot __P((void));
#endif
#include "isa.h"
#if NISA > 0
#include <i386/isa/isa_device.h>
#endif
#include "pci.h"
#if NPCI > 0
#include <pci/pcivar.h>
#endif
/*
* Determine i/o configuration for a machine.
*/
@ -82,12 +92,10 @@ void
configure()
{
#include "isa.h"
#if NISA > 0
isa_configure();
#endif
#include "pci.h"
#if NPCI > 0
pci_configure();
#endif
@ -159,12 +167,12 @@ swapconf()
u_long bootdev = 0; /* should be dev_t, but not until 32 bits */
static char devname[][2] = {
'w','d', /* 0 = wd */
's','w', /* 1 = sw */
{'w','d'}, /* 0 = wd */
{'s','w'}, /* 1 = sw */
#define FDMAJOR 2
'f','d', /* 2 = fd */
'w','t', /* 3 = wt */
's','d', /* 4 = sd -- new SCSI system */
{'f','d'}, /* 2 = fd */
{'w','t'}, /* 3 = wt */
{'s','d'}, /* 4 = sd -- new SCSI system */
};
#define PARTITIONMASK 0x7

24
sys/i386/i386/autoconf.c
View File

@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)autoconf.c 7.1 (Berkeley) 5/9/91
* $Id: autoconf.c,v 1.17 1994/12/31 17:11:59 jkh Exp $
* $Id: autoconf.c,v 1.18 1995/01/11 17:51:26 jkh Exp $
*/
/*
@ -75,6 +75,16 @@ int ffs_mountroot __P((void));
int nfs_mountroot __P((void));
#endif
#include "isa.h"
#if NISA > 0
#include <i386/isa/isa_device.h>
#endif
#include "pci.h"
#if NPCI > 0
#include <pci/pcivar.h>
#endif
/*
* Determine i/o configuration for a machine.
*/
@ -82,12 +92,10 @@ void
configure()
{
#include "isa.h"
#if NISA > 0
isa_configure();
#endif
#include "pci.h"
#if NPCI > 0
pci_configure();
#endif
@ -159,12 +167,12 @@ swapconf()
u_long bootdev = 0; /* should be dev_t, but not until 32 bits */
static char devname[][2] = {
'w','d', /* 0 = wd */
's','w', /* 1 = sw */
{'w','d'}, /* 0 = wd */
{'s','w'}, /* 1 = sw */
#define FDMAJOR 2
'f','d', /* 2 = fd */
'w','t', /* 3 = wt */
's','d', /* 4 = sd -- new SCSI system */
{'f','d'}, /* 2 = fd */
{'w','t'}, /* 3 = wt */
{'s','d'}, /* 4 = sd -- new SCSI system */
};
#define PARTITIONMASK 0x7