diff options
| author | rsc <rsc> | 2006-07-17 01:58:13 +0000 |
|---|---|---|
| committer | rsc <rsc> | 2006-07-17 01:58:13 +0000 |
| commit | b5f17007f41770fee97fa850635976ceb7aa7492 (patch) | |
| tree | 779473b174de7542e73219aed716d1c666a08a11 /bootmain.c | |
| parent | e0966f459f5543faf9e574b7415bec2bf11e6b42 (diff) | |
| download | xv6-labs-b5f17007f41770fee97fa850635976ceb7aa7492.tar.gz xv6-labs-b5f17007f41770fee97fa850635976ceb7aa7492.tar.bz2 xv6-labs-b5f17007f41770fee97fa850635976ceb7aa7492.zip | |
standarize on unix-like lowercase struct names
Diffstat (limited to 'bootmain.c')
| -rw-r--r-- | bootmain.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -31,7 +31,7 @@ **********************************************************************/ #define SECTSIZE 512 -#define ELFHDR ((struct Elf *) 0x10000) // scratch space +#define ELFHDR ((struct elfhdr *) 0x10000) // scratch space void readsect(void*, uint32_t); void readseg(uint32_t, uint32_t, uint32_t); @@ -39,7 +39,7 @@ void readseg(uint32_t, uint32_t, uint32_t); void cmain(void) { - struct Proghdr *ph, *eph; + struct proghdr *ph, *eph; // read 1st page off disk readseg((uint32_t) ELFHDR, SECTSIZE*8, 0); @@ -49,7 +49,7 @@ cmain(void) goto bad; // load each program segment (ignores ph flags) - ph = (struct Proghdr *) ((uint8_t *) ELFHDR + ELFHDR->phoff); + ph = (struct proghdr *) ((uint8_t *) ELFHDR + ELFHDR->phoff); eph = ph + ELFHDR->phnum; for (; ph < eph; ph++) readseg(ph->va, ph->memsz, ph->offset); |