git.ucc.asn.au
/
tpg
/
acess2.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2bdb445
)
Cleaning up pcidump / fixed compile warning in InitRD
author
John Hodge
<
[email protected]
>
Sat, 20 Nov 2010 02:20:10 +0000
(10:20 +0800)
committer
John Hodge
<
[email protected]
>
Sat, 20 Nov 2010 02:20:10 +0000
(10:20 +0800)
Modules/Filesystems/InitRD/initrd.h
patch
|
blob
|
history
Modules/Filesystems/InitRD/main.c
patch
|
blob
|
history
Usermode/Applications/pcidump_src/main.c
patch
|
blob
|
history
Usermode/Applications/pcidump_src/pcilist.h
patch
|
blob
|
history
diff --git
a/Modules/Filesystems/InitRD/initrd.h
b/Modules/Filesystems/InitRD/initrd.h
index
8ae97ae
..
8ebabd3
100644
(file)
--- 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);
// === 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, c
onst c
har *Name);
#endif
#endif
diff --git
a/Modules/Filesystems/InitRD/main.c
b/Modules/Filesystems/InitRD/main.c
index
97b40cc
..
ff24b51
100644
(file)
--- 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);
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, c
onst c
har *Name);
void InitRD_DumpDir(tVFS_Node *Node, int Indent);
// === GLOBALS ===
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
*/
/**
* \brief Find an element in a directory
*/
-tVFS_Node *InitRD_FindDir(tVFS_Node *Node, char *Name)
+tVFS_Node *InitRD_FindDir(tVFS_Node *Node, c
onst c
har *Name)
{
int i;
tInitRD_File *dir = Node->ImplPtr;
{
int i;
tInitRD_File *dir = Node->ImplPtr;
diff --git
a/Usermode/Applications/pcidump_src/main.c
b/Usermode/Applications/pcidump_src/main.c
index
0bdff40
..
919d5a6
100644
(file)
--- a/
Usermode/Applications/pcidump_src/main.c
+++ b/
Usermode/Applications/pcidump_src/main.c
@@
-14,7
+14,7
@@
// === CONSTANTS ===
\r
const struct {
\r
int ID;
\r
// === CONSTANTS ===
\r
const struct {
\r
int ID;
\r
- char *Name;
\r
+ char
*Name;
\r
} csaVENDORS[] = {
\r
{0x10EC, "Realtek"},
\r
{0x1106, "VIA Technologies, Inc."},
\r
} csaVENDORS[] = {
\r
{0x10EC, "Realtek"},
\r
{0x1106, "VIA Technologies, Inc."},
\r
@@
-39,7
+39,7
@@
int main(int argc, char *argv[], char *envp[])
\r
printf("PCI Bus Dump\n");
\r
// --- Open PCI Directory
\r
\r
printf("PCI Bus Dump\n");
\r
// --- Open PCI Directory
\r
- dp = open("/Devices/pci",
/*OPEN_FLAG_READ|*/
OPENFLAG_EXEC);
\r
+ dp = open("/Devices/pci",
OPENFLAG_READ|
OPENFLAG_EXEC);
\r
if(dp == -1)
\r
{
\r
fprintf(stderr, "Non-Standard configuration or not running on Acess.\n");
\r
if(dp == -1)
\r
{
\r
fprintf(stderr, "Non-Standard configuration or not running on Acess.\n");
\r
diff --git
a/Usermode/Applications/pcidump_src/pcilist.h
b/Usermode/Applications/pcidump_src/pcilist.h
index
f3f0a57
..
0bf2cef
100644
(file)
--- 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" } ,
{ 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" } ,
{ 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" } ,
{ 0x10F3, "Alaris", "Alaris Inc." } ,
{ 0x10F4, "S-Mos", "S-Mos Systems" } ,
{ 0x10F5, "NKK", "NKK Corporation" } ,
UCC
git Repository :: git.ucc.asn.au