sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

minor reformat

Browse Source 
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@1569 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
Li-Ta Lo
2004-05-24 19:48:13 +00:00
parent 9da7ff91f5
commit 9220f91f9c
2 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/devices/pci_device.c
View File

@@ -672,8 +672,8 @@ unsigned int pci_scan_bus(struct bus *bus, unsigned min_devfn,
} }
post_code(0x25); post_code(0x25);
/* if the child provides scan_bus(), for example a bridge, scan the /* if a child provides scan_bus(), for example a bridge, scan
* bus behind that child */ * buses behind that child */
for (child = bus->children; child; child = child->sibling) { for (child = bus->children; child; child = child->sibling) {
if (!child->ops->scan_bus) { if (!child->ops->scan_bus) {
continue; continue;

31
util/buildrom/buildrom.c
View File

@@ -17,20 +17,21 @@
* For now we assume "zero" is 0xff * For now we assume "zero" is 0xff
*/ */
void void usage()
usage(){ {
fprintf(stderr, "Usage: buildrom <input> <output> <payload> "); fprintf(stderr, "Usage: buildrom <input> <output> <payload> ");
fprintf(stderr, " <linuxbios-size> <total-size>\n"); fprintf(stderr, " <linuxbios-size> <total-size>\n");
exit(1); exit(1);
} }
void void fatal(char *s)
fatal(char *s){ {
perror(s); perror(s);
exit(2); exit(2);
} }
int
main(int argc, char *argv[]) { int main(int argc, char *argv[])
{
int infd, payloadfd, outfd, size, insize, readlen, writelen, i; int infd, payloadfd, outfd, size, insize, readlen, writelen, i;
int romsize; int romsize;
unsigned char *cp; unsigned char *cp;
@@ -40,24 +41,24 @@ main(int argc, char *argv[]) {
if (argc != 6) if (argc != 6)
usage(); usage();
infd = open(argv[1], O_RDONLY); infd = open(argv[1], O_RDONLY);
if (infd < 0) if (infd < 0)
fatal(argv[1]); fatal(argv[1]);
outfd = open(argv[2], O_RDWR|O_CREAT, 0666); outfd = open(argv[2], O_RDWR | O_CREAT, 0666);
if (outfd < 0) if (outfd < 0)
fatal(argv[2]); fatal(argv[2]);
payloadfd = open(argv[3], O_RDONLY); payloadfd = open(argv[3], O_RDONLY);
if (payloadfd < 0) if (payloadfd < 0)
fatal(argv[3]); fatal(argv[3]);
size = strtol(argv[4], 0, 0); size = strtol(argv[4], 0, 0);
romsize = strtol(argv[5], 0, 0); romsize = strtol(argv[5], 0, 0);
if (fstat(infd, &inbuf) < 0) if (fstat(infd, &inbuf) < 0)
fatal("stat of infile"); 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", 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"); 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"); fatal("payload + linuxbios size larger than ROM size!\n");
cp = malloc(romsize); cp = malloc(romsize);
if (! cp) if (!cp)
fatal("malloc buffer"); fatal("malloc buffer");
for (i = 0; i < romsize; i++)
for(i = 0; i < romsize; i++)
cp[i] = zero; cp[i] = zero;
/* read the input file in at the END of the array */ /* read the input file in at the END of the array */
readlen = read(infd, &cp[romsize - inbuf.st_size], inbuf.st_size); readlen = read(infd, &cp[romsize - inbuf.st_size], inbuf.st_size);
if (readlen < 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 */ /* read the payload file in at the START of the array */
readlen = read(payloadfd, cp, payloadbuf.st_size); readlen = read(payloadfd, cp, payloadbuf.st_size);
if (readlen < payloadbuf.st_size) { if (readlen < payloadbuf.st_size) {
fprintf(stderr, "Wanted %d, got %d\n", fprintf(stderr, "Wanted %d, got %d\n",
payloadbuf.st_size, readlen); payloadbuf.st_size, readlen);
fatal("Read payload file"); fatal("Read payload file");
} }
writelen = write(outfd, cp, romsize); writelen = write(outfd, cp, romsize);