at_wini now calls pci_reserve.

This commit is contained in:
Philip Homburg 2006-11-01 14:55:00 +00:00
parent 86303b3024
commit 954ad990e5
5 changed files with 14 additions and 2 deletions

View file

@ -569,6 +569,8 @@ PRIVATE void init_params_pci(int skip)
else else
continue; /* Unsupported device class */ continue; /* Unsupported device class */
pci_reserve(devind);
/* Found a controller. /* Found a controller.
* Programming interface register tells us more. * Programming interface register tells us more.
*/ */

View file

@ -7,7 +7,8 @@ then
echo Using bios_wini. echo Using bios_wini.
/bin/service -c up /bin/bios_wini -dev /dev/c0d0 /bin/service -c up /bin/bios_wini -dev /dev/c0d0
else else
/bin/service -c up /bin/at_wini -dev /dev/c0d0 -script /etc/rs.single -config /etc/drivers.conf /bin/service -c up /bin/at_wini -dev /dev/c0d0 -config /etc/drivers.conf
#/bin/service -c up /bin/at_wini -dev /dev/c0d0 -script /etc/rs.single -config /etc/drivers.conf
fi fi
rootdev=`sysenv rootdev` || echo 'No rootdev?' rootdev=`sysenv rootdev` || echo 'No rootdev?'

View file

@ -971,7 +971,10 @@ int devind;
continue; /* Skip */ continue; /* Skip */
} }
if (i == j) if (i == j)
{
j++;
continue; /* No need to copy */ continue; /* No need to copy */
}
pcidev[devind].pd_bar[j]= pcidev[devind].pd_bar[j]=
pcidev[devind].pd_bar[i]; pcidev[devind].pd_bar[i];
j++; j++;

View file

@ -113,9 +113,12 @@ driver at_wini
{ {
io 1f0:8 # Controller 0 io 1f0:8 # Controller 0
3f6 # Also controller 0 3f6 # Also controller 0
170:8 # Controller 1
376 # Also controller 1
; ;
irq irq
14 # Controller 0 14 # Controller 0
15 # Controller 1
; ;
system system
KILL # 6 KILL # 6
@ -132,4 +135,7 @@ driver at_wini
SETGRANT # 34 SETGRANT # 34
READBIOS # 35 READBIOS # 35
; ;
pci class
1/1 # Mass storage / IDE
;
}; };

View file

@ -17,7 +17,7 @@
#include "type.h" #include "type.h"
/* Max. number of I/O ranges that can be assigned to a process */ /* Max. number of I/O ranges that can be assigned to a process */
#define NR_IO_RANGE 10 #define NR_IO_RANGE 32
/* Max. number of device memory ranges that can be assigned to a process */ /* Max. number of device memory ranges that can be assigned to a process */
#define NR_MEM_RANGE 10 #define NR_MEM_RANGE 10