at_wini now calls pci_reserve.

diff --git a/drivers/at_wini/at_wini.c b/drivers/at_wini/at_wini.c
index 846580207df066240cb78269763d70f459ed5353..3ea656f19031ea48c89e76bfb8117f05026d13b2 100644 (file)
--- a/drivers/at_wini/at_wini.c
+++ b/drivers/at_wini/at_wini.c
@@ -569,6 +569,8 @@ PRIVATE void init_params_pci(int skip)
        else
                continue;       /* Unsupported device class */
 
+       pci_reserve(devind);
+
        /* Found a controller.
         * Programming interface register tells us more.
         */

diff --git a/drivers/memory/ramdisk/rc b/drivers/memory/ramdisk/rc
index 0c4cad34cda1d85c7ff08636679d712b2685a66e..118aed85ddaddff5ed6db05abc43156f27d19fef 100644 (file)
--- a/drivers/memory/ramdisk/rc
+++ b/drivers/memory/ramdisk/rc
@@ -7,7 +7,8 @@ then
        echo Using bios_wini.
        /bin/service -c up /bin/bios_wini -dev /dev/c0d0
 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
 
 rootdev=`sysenv rootdev` || echo 'No rootdev?'

diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index b4bd7b5c858c914d8ff6ac724f800e083f2945e7..1e5c798e77c9ef7af436802a46ca6b80a4eac8c1 100644 (file)
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -971,7 +971,10 @@ int devind;
                                continue;       /* Skip */
                        }
                        if (i == j)
+                       {
+                               j++;
                                continue;       /* No need to copy */
+                       }
                        pcidev[devind].pd_bar[j]=
                                pcidev[devind].pd_bar[i];
                        j++;

diff --git a/etc/drivers.conf b/etc/drivers.conf
index 88090f6c3371ce4f0b4603d5c04c71331622dc20..a8ee1c375000194ed7d30fbe312da32baaef4626 100644 (file)
--- a/etc/drivers.conf
+++ b/etc/drivers.conf
@@ -113,9 +113,12 @@ driver at_wini
 {
        io      1f0:8           # Controller 0
                3f6             # Also controller 0
+               170:8           # Controller 1
+               376             # Also controller 1
        ;
        irq
                14              # Controller 0
+               15              # Controller 1
        ;
        system
                KILL            #  6
@@ -132,4 +135,7 @@ driver at_wini
                SETGRANT        # 34
                READBIOS        # 35
        ;
+       pci class       
+               1/1             # Mass storage / IDE
+       ;
 };

diff --git a/kernel/priv.h b/kernel/priv.h
index 78668adedfd7b881020e10e1a5c90de6d06422a2..c02208b3c8ad7a0726ad8eb2939c4f6cdcfd81b1 100755 (executable)
--- a/kernel/priv.h
+++ b/kernel/priv.h
@@ -17,7 +17,7 @@
 #include "type.h"
 
 /* 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 */
 #define NR_MEM_RANGE   10