diff options
| -rw-r--r-- | src/devices/pci_device.c | 4 | ||||
| -rw-r--r-- | util/buildrom/buildrom.c | 31 |
2 files changed, 18 insertions, 17 deletions
diff --git a/src/devices/pci_device.c b/src/devices/pci_device.c index a185aae8d6..f40b4d8adf 100644 --- a/src/devices/pci_device.c +++ b/src/devices/pci_device.c @@ -672,8 +672,8 @@ unsigned int pci_scan_bus(struct bus *bus, unsigned min_devfn, } post_code(0x25); - /* if the child provides scan_bus(), for example a bridge, scan the - * bus behind that child */ + /* if a child provides scan_bus(), for example a bridge, scan + * buses behind that child */ for (child = bus->children; child; child = child->sibling) { if (!child->ops->scan_bus) { continue; diff --git a/util/buildrom/buildrom.c b/util/buildrom/buildrom.c index 27a5d447d0..0de18f5db2 100644 --- a/util/buildrom/buildrom.c +++ b/util/buildrom/buildrom.c @@ -17,20 +17,21 @@ * For now we assume "zero" is 0xff */ -void -usage(){ +void usage() +{ fprintf(stderr, "Usage: buildrom <input> <output> <payload> "); fprintf(stderr, " <linuxbios-size> <total-size>\n"); exit(1); } -void -fatal(char *s){ +void fatal(char *s) +{ perror(s); exit(2); } -int -main(int argc, char *argv[]) { + +int main(int argc, char *argv[]) +{ int infd, payloadfd, outfd, size, insize, readlen, writelen, i; int romsize; unsigned char *cp; @@ -40,24 +41,24 @@ main(int argc, char *argv[]) { if (argc != 6) usage(); - infd = open(argv[1], O_RDONLY); if (infd < 0) fatal(argv[1]); - outfd = open(argv[2], O_RDWR|O_CREAT, 0666); + outfd = open(argv[2], O_RDWR | O_CREAT, 0666); if (outfd < 0) fatal(argv[2]); payloadfd = open(argv[3], O_RDONLY); if (payloadfd < 0) fatal(argv[3]); + size = strtol(argv[4], 0, 0); romsize = strtol(argv[5], 0, 0); if (fstat(infd, &inbuf) < 0) fatal("stat of infile"); - if (inbuf.st_size > size) { + if (inbuf.st_size > size) { fprintf(stderr, "linuxbios image is %d bytes; only %d allowed\n", - inbuf.st_size, size); + inbuf.st_size, size); fatal("Linuxbios input file larger than allowed size!\n"); } @@ -67,11 +68,11 @@ main(int argc, char *argv[]) { fatal("payload + linuxbios size larger than ROM size!\n"); cp = malloc(romsize); - if (! cp) + if (!cp) fatal("malloc buffer"); - - for(i = 0; i < romsize; i++) + for (i = 0; i < romsize; i++) cp[i] = zero; + /* read the input file in at the END of the array */ readlen = read(infd, &cp[romsize - inbuf.st_size], inbuf.st_size); if (readlen < inbuf.st_size) { @@ -82,8 +83,8 @@ main(int argc, char *argv[]) { /* read the payload file in at the START of the array */ readlen = read(payloadfd, cp, payloadbuf.st_size); if (readlen < payloadbuf.st_size) { - fprintf(stderr, "Wanted %d, got %d\n", - payloadbuf.st_size, readlen); + fprintf(stderr, "Wanted %d, got %d\n", + payloadbuf.st_size, readlen); fatal("Read payload file"); } writelen = write(outfd, cp, romsize); |