X-Git-Url: http://git.ozlabs.org/?p=yaboot.git;a=blobdiff_plain;f=second%2Fprom.c;h=037c7380a3ecff5af548e55a21348fed7e3edf02;hp=33dfcda6d4dd0f5343dad627c24cff96a707a436;hb=da7857367944c983abf98f956241dcc614b2f453;hpb=5613f9fab88b71f14259856b390f1cc989b602bf diff --git a/second/prom.c b/second/prom.c index 33dfcda..037c738 100644 --- a/second/prom.c +++ b/second/prom.c @@ -30,6 +30,7 @@ #include "ctype.h" #include "asm/processor.h" #include "errors.h" +#include "debug.h" #define READ_BLOCKS_USE_READ 1 @@ -43,125 +44,125 @@ static ihandle prom_mem, prom_mmu; static ihandle prom_chosen, prom_options; struct prom_args { - const char *service; - int nargs; - int nret; - void *args[10]; + const char *service; + int nargs; + int nret; + void *args[10]; }; void * call_prom (const char *service, int nargs, int nret, ...) { - va_list list; - int i; - struct prom_args prom_args; + va_list list; + int i; + struct prom_args prom_args; - prom_args.service = service; - prom_args.nargs = nargs; - prom_args.nret = nret; - va_start (list, nret); - for (i = 0; i < nargs; ++i) - prom_args.args[i] = va_arg(list, void *); - va_end(list); - for (i = 0; i < nret; ++i) - prom_args.args[i + nargs] = 0; - prom (&prom_args); - if (nret > 0) - return prom_args.args[nargs]; - else - return 0; + prom_args.service = service; + prom_args.nargs = nargs; + prom_args.nret = nret; + va_start (list, nret); + for (i = 0; i < nargs; ++i) + prom_args.args[i] = va_arg(list, void *); + va_end(list); + for (i = 0; i < nret; ++i) + prom_args.args[i + nargs] = 0; + prom (&prom_args); + if (nret > 0) + return prom_args.args[nargs]; + else + return 0; } void * call_prom_return (const char *service, int nargs, int nret, ...) { - va_list list; - int i; - void* result; - struct prom_args prom_args; + va_list list; + int i; + void* result; + struct prom_args prom_args; - prom_args.service = service; - prom_args.nargs = nargs; - prom_args.nret = nret; - va_start (list, nret); - for (i = 0; i < nargs; ++i) - prom_args.args[i] = va_arg(list, void *); - for (i = 0; i < nret; ++i) - prom_args.args[i + nargs] = 0; - if (prom (&prom_args) != 0) - return PROM_INVALID_HANDLE; - if (nret > 0) { - result = prom_args.args[nargs]; - for (i=1; i 0) { + result = prom_args.args[nargs]; + for (i=1; i> 32), (unsigned int)(pos & 0xffffffffUL)); - return status == 0 || status == 1; + int status = (int)call_prom ("seek", 3, 1, file, + (unsigned int)(pos >> 32), (unsigned int)(pos & 0xffffffffUL)); + return status == 0 || status == 1; } int prom_loadmethod (prom_handle device, void* addr) { - return (int)call_method_1 ("load", device, 1, addr); + return (int)call_method_1 ("load", device, 1, addr); } int prom_getblksize (prom_handle file) { - return (int)call_method_1 ("block-size", file, 0); + return (int)call_method_1 ("block-size", file, 0); } int prom_readblocks (prom_handle dev, int blockNum, int blockCount, void *buffer) { #if READ_BLOCKS_USE_READ - int status; - unsigned int blksize; + int status; + unsigned int blksize; - blksize = prom_getblksize(dev); - if (blksize <= 1) - blksize = 512; - status = prom_seek(dev, blockNum * blksize); - if (status != 1) { - return 0; - prom_printf("Can't seek to 0x%x\n", blockNum * blksize); - } + blksize = prom_getblksize(dev); + if (blksize <= 1) + blksize = 512; + status = prom_seek(dev, blockNum * blksize); + if (status != 1) { + return 0; + prom_printf("Can't seek to 0x%x\n", blockNum * blksize); + } - status = prom_read(dev, buffer, blockCount * blksize); + status = prom_read(dev, buffer, blockCount * blksize); // prom_printf("prom_readblocks, bl: %d, cnt: %d, status: %d\n", // blockNum, blockCount, status); - return status == (blockCount * blksize); + return status == (blockCount * blksize); #else - int result; - int retries = 10; + int result; + int retries = 10; - if (blockCount == 0) - return blockCount; - while(--retries) { - result = call_method_1 ("read-blocks", dev, 3, buffer, blockNum, blockCount); - if (result != 0) - break; - call_prom("interpret", 1, 1, " 10 ms"); - } + if (blockCount == 0) + return blockCount; + while(--retries) { + result = call_method_1 ("read-blocks", dev, 3, buffer, blockNum, blockCount); + if (result != 0) + break; + call_prom("interpret", 1, 1, " 10 ms"); + } - return result; + return result; #endif } int prom_getchar () { - char c[4]; - int a; + char c[4]; + int a; - while ((a = (int)call_prom ("read", 3, 1, prom_stdin, c, 4)) == 0) - ; - if (a == -1) - prom_abort ("EOF on console\n"); - if (a == 3 && c[0] == '\e' && c[1] == '[') - return 0x100 | c[2]; - return c[0]; + while ((a = (int)call_prom ("read", 3, 1, prom_stdin, c, 4)) == 0) + ; + if (a == -1) + prom_abort ("EOF on console\n"); + if (a == 3 && c[0] == '\e' && c[1] == '[') + return 0x100 | c[2]; + return c[0]; } int prom_nbgetchar() { - char ch; + char ch; - return (int) call_prom("read", 3, 1, prom_stdin, &ch, 1) > 0? ch: -1; + return (int) call_prom("read", 3, 1, prom_stdin, &ch, 1) > 0? ch: -1; } void prom_putchar (char c) { - if (c == '\n') - call_prom ("write", 3, 1, prom_stdout, "\r\n", 2); - else - call_prom ("write", 3, 1, prom_stdout, &c, 1); + if (c == '\n') + call_prom ("write", 3, 1, prom_stdout, "\r\n", 2); + else + call_prom ("write", 3, 1, prom_stdout, &c, 1); } void prom_puts (prom_handle file, char *s) { - const char *p, *q; - - for (p = s; *p != 0; p = q) - { - for (q = p; *q != 0 && *q != '\n'; ++q) - ; - if (q > p) - call_prom ("write", 3, 1, file, p, q - p); - if (*q != 0) - { - ++q; - call_prom ("write", 3, 1, file, "\r\n", 2); - } - } + const char *p, *q; + + for (p = s; *p != 0; p = q) + { + for (q = p; *q != 0 && *q != '\n'; ++q) + ; + if (q > p) + call_prom ("write", 3, 1, file, p, q - p); + if (*q != 0) + { + ++q; + call_prom ("write", 3, 1, file, "\r\n", 2); + } + } } void prom_vfprintf (prom_handle file, char *fmt, va_list ap) { - static char printf_buf[1536]; - vsprintf (printf_buf, fmt, ap); - prom_puts (file, printf_buf); + static char printf_buf[1536]; + vsprintf (printf_buf, fmt, ap); + prom_puts (file, printf_buf); } void prom_vprintf (char *fmt, va_list ap) { - static char printf_buf[1536]; - vsprintf (printf_buf, fmt, ap); - prom_puts (prom_stdout, printf_buf); + static char printf_buf[1536]; + vsprintf (printf_buf, fmt, ap); + prom_puts (prom_stdout, printf_buf); } void prom_fprintf (prom_handle file, char *fmt, ...) { - va_list ap; - va_start (ap, fmt); - prom_vfprintf (file, fmt, ap); - va_end (ap); + va_list ap; + va_start (ap, fmt); + prom_vfprintf (file, fmt, ap); + va_end (ap); } void prom_printf (char *fmt, ...) { - va_list ap; - va_start (ap, fmt); - prom_vfprintf (prom_stdout, fmt, ap); - va_end (ap); + va_list ap; + va_start (ap, fmt); + prom_vfprintf (prom_stdout, fmt, ap); + va_end (ap); } void @@ -480,59 +479,59 @@ prom_perror (int error, char *filename) void prom_readline (char *prompt, char *buf, int len) { - int i = 0; - int c; - - if (prompt) - prom_puts (prom_stdout, prompt); - - while (i < len-1 && (c = prom_getchar ()) != '\r') - { - if (c >= 0x100) - continue; - if (c == 8) - { - if (i > 0) - { - prom_puts (prom_stdout, "\b \b"); - i--; - } + int i = 0; + int c; + + if (prompt) + prom_puts (prom_stdout, prompt); + + while (i < len-1 && (c = prom_getchar ()) != '\r') + { + if (c >= 0x100) + continue; + if (c == 8) + { + if (i > 0) + { + prom_puts (prom_stdout, "\b \b"); + i--; + } + else + prom_putchar ('\a'); + } + else if (isprint (c)) + { + prom_putchar (c); + buf[i++] = c; + } else - prom_putchar ('\a'); - } - else if (isprint (c)) - { - prom_putchar (c); - buf[i++] = c; - } - else - prom_putchar ('\a'); - } - prom_putchar ('\n'); - buf[i] = 0; + prom_putchar ('\a'); + } + prom_putchar ('\n'); + buf[i] = 0; } #ifdef CONFIG_SET_COLORMAP int prom_set_color(prom_handle device, int color, int r, int g, int b) { - return (int)call_prom( "call-method", 6, 1, "color!", device, color, b, g, r ); + return (int)call_prom( "call-method", 6, 1, "color!", device, color, b, g, r ); } #endif /* CONFIG_SET_COLORMAP */ void prom_exit () { - call_prom ("exit", 0, 0); + call_prom ("exit", 0, 0); } void prom_abort (char *fmt, ...) { - va_list ap; - va_start (ap, fmt); - prom_vfprintf (prom_stdout, fmt, ap); - va_end (ap); - prom_exit (); + va_list ap; + va_start (ap, fmt); + prom_vfprintf (prom_stdout, fmt, ap); + va_end (ap); + prom_exit (); } void @@ -546,18 +545,18 @@ prom_sleep (int seconds) void * prom_claim (void *virt, unsigned int size, unsigned int align) { - return call_prom ("claim", 3, 1, virt, size, align); + return call_prom ("claim", 3, 1, virt, size, align); } void prom_release(void *virt, unsigned int size) { // call_prom ("release", 2, 1, virt, size); - /* release in not enough, it needs also an unmap call. This bit of forth - * code inspired from Darwin's bootloader but could be replaced by direct - * calls to the MMU package if needed - */ - call_prom ("interpret", 3, 1, + /* release in not enough, it needs also an unmap call. This bit of forth + * code inspired from Darwin's bootloader but could be replaced by direct + * calls to the MMU package if needed + */ + call_prom ("interpret", 3, 1, #if DEBUG ".\" ReleaseMem:\" 2dup . . cr " #endif @@ -568,62 +567,68 @@ prom_release(void *virt, unsigned int size) "2dup \" release\" ^mmu " // Then free the virtual pages "\" release\" ^mem " // Then free the physical pages ,size, virt - ); + ); } void prom_map (void *phys, void *virt, int size) { - unsigned long msr = mfmsr(); + unsigned long msr = mfmsr(); - /* Only create a mapping if we're running with relocation enabled. */ - if ( (msr & MSR_IR) && (msr & MSR_DR) ) - call_method_1 ("map", prom_mmu, 4, -1, size, virt, phys); + /* Only create a mapping if we're running with relocation enabled. */ + if ( (msr & MSR_IR) && (msr & MSR_DR) ) + call_method_1 ("map", prom_mmu, 4, -1, size, virt, phys); } void prom_unmap (void *phys, void *virt, int size) { - unsigned long msr = mfmsr(); + unsigned long msr = mfmsr(); - /* Only unmap if we're running with relocation enabled. */ - if ( (msr & MSR_IR) && (msr & MSR_DR) ) - call_method_1 ("map", prom_mmu, 4, -1, size, virt, phys); + /* Only unmap if we're running with relocation enabled. */ + if ( (msr & MSR_IR) && (msr & MSR_DR) ) + call_method_1 ("map", prom_mmu, 4, -1, size, virt, phys); } char * prom_getargs () { - static char args[256]; - int l; + static char args[256]; + int l; - l = prom_get_chosen ("bootargs", args, 255); - args[l] = '\0'; - return args; + l = prom_get_chosen ("bootargs", args, 255); + args[l] = '\0'; + return args; } void prom_setargs (char *args) { - int l = strlen (args)+1; - if ((int)call_prom ("setprop", 4, 1, prom_chosen, "bootargs", args, l) != l) - prom_printf ("can't set args\n"); + int l = strlen (args)+1; + if ((int)call_prom ("setprop", 4, 1, prom_chosen, "bootargs", args, l) != l) + prom_printf ("can't set args\n"); } int prom_interpret (char *forth) { - return (int)call_prom("interpret", 1, 1, forth); + return (int)call_prom("interpret", 1, 1, forth); } int prom_getms(void) { - return (int) call_prom("milliseconds", 0, 1); + return (int) call_prom("milliseconds", 0, 1); } void prom_pause(void) { - call_prom("enter", 0, 0); + call_prom("enter", 0, 0); } +/* + * Local variables: + * c-file-style: "k&r" + * c-basic-offset: 5 + * End: + */