Fixed bug where system would lock if a user task segfaulted (forgot to sti)

[tpg/acess2.git] / Kernel / drv / pci.c

diff --git a/Kernel/drv/pci.c b/Kernel/drv/pci.c
index 59a7d77..43d6d54 100644 (file)
--- a/Kernel/drv/pci.c
+++ b/Kernel/drv/pci.c
@@ -1,13 +1,13 @@
 /*\r
-AcessOS/AcessBasic v0.1\r
-PCI Bus Driver\r
-*/\r
+ * AcessOS/AcessBasic v0.1\r
+ * PCI Bus Driver\r
+ */\r
+#define DEBUG  0\r
 #include <common.h>\r
 #include <vfs.h>\r
 #include <fs_devfs.h>\r
 #include <drv_pci.h>\r
 \r
-#define DEBUG  0\r
 #define        LIST_DEVICES    1\r
 \r
 // === STRUCTURES ===\r
@@ -167,7 +167,7 @@ char *PCI_ReadDirRoot(tVFS_Node *Node, int Pos)
                return NULL;\r
        }\r
        \r
-       LEAVE('%s', gPCI_Devices[Pos].Name);\r
+       LEAVE('s', gPCI_Devices[Pos].Name);\r
        return strdup( gPCI_Devices[Pos].Name );\r
 }\r
 /**\r
@@ -468,7 +468,7 @@ int PCI_EnumDevice(Uint16 bus, Uint16 slot, Uint16 fcn, t_pciDevice *info)
        info->Name[2] = '.';\r
        info->Name[3] = '0' + slot/10;\r
        info->Name[4] = '0' + slot%10;\r
-       info->Name[5] = '.';\r
+       info->Name[5] = ':';\r
        info->Name[6] = '0' + fcn;\r
        info->Name[7] = '\0';\r
        \r