Firebee/FireBee_SVN
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

include pci_mem into standard build and fix printf parameter warnings

Browse Source
This commit is contained in:
Markus Fröschle
2016-10-23 09:32:02 +00:00
parent 3a2c3377e8
commit 0a71ff3308
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tos/Makefile
View File

@@ -31,6 +31,7 @@ clean:
@(cd bascook; make clean) @(cd bascook; make clean)
@(cd vmem_test; make clean) @(cd vmem_test; make clean)
@(cd pci_test; make clean) @(cd pci_test; make clean)
@(cd pci_mem; make clean)
@(cd fpga_test; make clean) @(cd fpga_test; make clean)

8
tos/pci_mem/sources/pci_mem.c
View File

@@ -32,7 +32,7 @@ void add_mem(struct pci_native_driver_interface *pci)
{ {
struct pci_rd *rd; struct pci_rd *rd;
printf("ATI device with handle 0x%02x found\r\n", handle); printf("ATI device with handle 0x%02x found\r\n", (unsigned int) handle);
rd = PCI_GET_RESOURCE(handle); /* get resource descriptor for ATI graphics card */ rd = PCI_GET_RESOURCE(handle); /* get resource descriptor for ATI graphics card */
printf("rd=%p\r\n", rd); printf("rd=%p\r\n", rd);
printf("start=%lx, length=%lx, flags=%x\r\n", rd->start, rd->length, rd->flags); printf("start=%lx, length=%lx, flags=%x\r\n", rd->start, rd->length, rd->flags);
@@ -47,19 +47,19 @@ void add_mem(struct pci_native_driver_interface *pci)
if ((err = Maddalt(0x04000000 /* rd->start + 0x7C000000UL */, rd->length)) > 0) if ((err = Maddalt(0x04000000 /* rd->start + 0x7C000000UL */, rd->length)) > 0)
{ {
printf("%ld MBytes of additional memory added to system at %p\r\n", printf("%ld MBytes of additional memory added to system at %p\r\n",
rd->length / 1024 / 1024, 0x04000000 /* rd->start + 0x7C000000 */); (long) (rd->length / 1024 / 1024), (void *) 0x04000000 /* rd->start + 0x7C000000 */);
return; return;
} }
else else
{ {
fprintf(stderr, "Maddalt() returned error code %ld\r\n", err); fprintf(stderr, "Maddalt() returned error code %ld\r\n", (long) err);
exit(1); exit(1);
} }
} }
} }
else else
{ {
fprintf(stderr, "no resource descriptor for handle 0x%02x found", handle); fprintf(stderr, "no resource descriptor for handle 0x%02x found", (unsigned int) handle);
exit(1); exit(1);
} }
} }