From a54379686bef79c24e4a1e2337611f33d33c8b4b Mon Sep 17 00:00:00 2001 From: John Hodge Date: Sat, 20 Nov 2010 10:20:10 +0800 Subject: [PATCH] Cleaning up pcidump / fixed compile warning in InitRD --- Modules/Filesystems/InitRD/initrd.h | 2 +- Modules/Filesystems/InitRD/main.c | 4 ++-- Usermode/Applications/pcidump_src/main.c | 4 ++-- Usermode/Applications/pcidump_src/pcilist.h | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Modules/Filesystems/InitRD/initrd.h b/Modules/Filesystems/InitRD/initrd.h index 8ae97aec..8ebabd36 100644 --- a/Modules/Filesystems/InitRD/initrd.h +++ b/Modules/Filesystems/InitRD/initrd.h @@ -16,6 +16,6 @@ typedef struct sInitRD_File // === Functions === extern Uint64 InitRD_ReadFile(tVFS_Node *Node, Uint64 Offset, Uint64 Size, void *Buffer); extern char *InitRD_ReadDir(tVFS_Node *Node, int ID); -extern tVFS_Node *InitRD_FindDir(tVFS_Node *Node, char *Name); +extern tVFS_Node *InitRD_FindDir(tVFS_Node *Node, const char *Name); #endif diff --git a/Modules/Filesystems/InitRD/main.c b/Modules/Filesystems/InitRD/main.c index 97b40cca..ff24b516 100644 --- a/Modules/Filesystems/InitRD/main.c +++ b/Modules/Filesystems/InitRD/main.c @@ -16,7 +16,7 @@ tVFS_Node *InitRD_InitDevice(char *Device, char **Arguments); void InitRD_Unmount(tVFS_Node *Node); Uint64 InitRD_ReadFile(tVFS_Node *Node, Uint64 Offset, Uint64 Size, void *Buffer); char *InitRD_ReadDir(tVFS_Node *Node, int ID); -tVFS_Node *InitRD_FindDir(tVFS_Node *Node, char *Name); +tVFS_Node *InitRD_FindDir(tVFS_Node *Node, const char *Name); void InitRD_DumpDir(tVFS_Node *Node, int Indent); // === GLOBALS === @@ -84,7 +84,7 @@ char *InitRD_ReadDir(tVFS_Node *Node, int ID) /** * \brief Find an element in a directory */ -tVFS_Node *InitRD_FindDir(tVFS_Node *Node, char *Name) +tVFS_Node *InitRD_FindDir(tVFS_Node *Node, const char *Name) { int i; tInitRD_File *dir = Node->ImplPtr; diff --git a/Usermode/Applications/pcidump_src/main.c b/Usermode/Applications/pcidump_src/main.c index 0bdff407..919d5a69 100644 --- a/Usermode/Applications/pcidump_src/main.c +++ b/Usermode/Applications/pcidump_src/main.c @@ -14,7 +14,7 @@ // === CONSTANTS === const struct { int ID; - char *Name; + char *Name; } csaVENDORS[] = { {0x10EC, "Realtek"}, {0x1106, "VIA Technologies, Inc."}, @@ -39,7 +39,7 @@ int main(int argc, char *argv[], char *envp[]) printf("PCI Bus Dump\n"); // --- Open PCI Directory - dp = open("/Devices/pci", /*OPEN_FLAG_READ|*/OPENFLAG_EXEC); + dp = open("/Devices/pci", OPENFLAG_READ|OPENFLAG_EXEC); if(dp == -1) { fprintf(stderr, "Non-Standard configuration or not running on Acess.\n"); diff --git a/Usermode/Applications/pcidump_src/pcilist.h b/Usermode/Applications/pcidump_src/pcilist.h index f3f0a574..0bf2cefb 100644 --- a/Usermode/Applications/pcidump_src/pcilist.h +++ b/Usermode/Applications/pcidump_src/pcilist.h @@ -258,13 +258,13 @@ PCI_VENTABLE PciVenTable [] = { 0x10E9, "Alps", "Alps Electronic Corp. Ltd." } , { 0x10EA, "Tvia", "Tvia, Inc." } , { 0x10EB, "Artist", "Artist Graphics" } , - { 0x10EC, "Realtek", "Realtek RTL8191SE 802.11b/g/n Wireless LAN Driver" } , + { 0x10EC, "Realtek", "Realtek Corp" } , { 0x10ED, "Ascii", "Ascii Corporation" } , { 0x10EE, "Xilinx", "Xilinx Corporation" } , { 0x10EF, "Racore", "Racore Computer Products" } , { 0x10F0, "Real-Time Graphics & Video", "Curtiss-Wright Controls Embedded Computing" } , { 0x10F1, "Tyan", "Tyan Computer" } , - { 0x10F2, "Achme", "Achme Computer Inc. - GONE !!!!" } , + { 0x10F2, "Achme", "Achme Computer Inc." } , { 0x10F3, "Alaris", "Alaris Inc." } , { 0x10F4, "S-Mos", "S-Mos Systems" } , { 0x10F5, "NKK", "NKK Corporation" } , -- 2.20.1