OpenBIOS November 2009

openbios@openbios.org

15 participants
81 discussions

r598 - trunk/openbios-devel/modules
by svn＠openbios.org 06 Nov '09

06 Nov '09

Author: laurent Date: 2009-11-06 21:59:24 +0000 (Fri, 06 Nov 2009) New Revision: 598 Modified: trunk/openbios-devel/modules/client.c Log: Client Interface: manage arguments number overflow Signed-off-by: Laurent Vivier <Laurent(a)vivier.eu> Modified: trunk/openbios-devel/modules/client.c =================================================================== --- trunk/openbios-devel/modules/client.c 2009-11-06 21:23:32 UTC (rev 597) +++ trunk/openbios-devel/modules/client.c 2009-11-06 21:59:24 UTC (rev 598) @@ -29,11 +29,12 @@ * (it doesn't) or if the function is unimplemented. */ +#define PROM_MAX_ARGS 10 typedef struct prom_args { const char *service; long nargs; long nret; - ulong args[10]; /* MAX NUM ARGS! */ + ulong args[PROM_MAX_ARGS]; } prom_args_t; #ifdef DEBUG_CIF @@ -258,7 +259,8 @@ prom_args_t *pb = (prom_args_t*)params; int val, i, dstacksave; - if( pb->nargs < 0 || pb->nret < 0 ) + if( pb->nargs < 0 || pb->nret < 0 || + pb->nargs + pb->nret > PROM_MAX_ARGS) return -1; #ifdef DEBUG_CIF dump_service(pb);

1 0

r597 - trunk/openbios-devel/drivers
by svn＠openbios.org 06 Nov '09

06 Nov '09

Author: laurent Date: 2009-11-06 21:23:32 +0000 (Fri, 06 Nov 2009) New Revision: 597 Modified: trunk/openbios-devel/drivers/adb_kbd.c trunk/openbios-devel/drivers/kbd.c trunk/openbios-devel/drivers/kbd.h Log: ADB: Manage arrow keys and more. Manage more keyboard keys by emiting escape sequences. This allows to manage key up, key down, key left, key right, home, end ... (F1 to F16, HELP, ... are not tested) Signed-off-by: Laurent Vivier <Laurent(a)vivier.eu> Modified: trunk/openbios-devel/drivers/adb_kbd.c =================================================================== --- trunk/openbios-devel/drivers/adb_kbd.c 2009-11-05 21:39:58 UTC (rev 596) +++ trunk/openbios-devel/drivers/adb_kbd.c 2009-11-06 21:23:32 UTC (rev 597) @@ -49,11 +49,48 @@ { "read", keyboard_read }, }; -/* ADB US keyboard translation map - * XXX: for now, only shift modifier is defined - */ +/* VT100 escape sequences */ +enum { + KEY_UP = 0, KEY_DOWN, KEY_RIGHT, KEY_LEFT, KEY_PAGE_UP, KEY_PAGE_DOWN, + KEY_DELETE, KEY_HOME, KEY_END, KEY_HELP, + KEY_F1, KEY_F2, KEY_F3, KEY_F4, KEY_F5, KEY_F6, KEY_F7, KEY_F8, + KEY_F9, KEY_F10, KEY_F11, KEY_F12, KEY_F13, KEY_F14, KEY_F15, KEY_F16 +}; +#define ADB_MAX_SEQUENCE_LEN 16 + +static const char *ADB_sequences[] = { + [KEY_UP] = "A[", + [KEY_DOWN] = "B[", + [KEY_RIGHT] = "C[", + [KEY_LEFT] = "D[", + [KEY_PAGE_UP] = "~5[", + [KEY_PAGE_DOWN] = "~6[", + [KEY_DELETE] = "~3[", + [KEY_HOME] = "HO", + [KEY_END] = "FO", + [KEY_HELP] = "~2[", + [KEY_F1] = "PO", + [KEY_F2] = "QO", + [KEY_F3] = "RO", + [KEY_F4] = "SO", + [KEY_F5] = "~15[", + [KEY_F6] = "~17[", + [KEY_F7] = "~18[", + [KEY_F8] = "~19[", + [KEY_F9] = "~20[", + [KEY_F10] = "~21[", + [KEY_F11] = "~23[", + [KEY_F12] = "~24[", + [KEY_F13] = "~25[", + [KEY_F14] = "~26[", + [KEY_F15] = "~28[", + [KEY_F15] = "~29[", +}; + +/* ADB US keyboard translation map */ + static const keymap_t ADB_kbd_us[] = { /* 0x00 */ { KBD_SH_CAPS, { 0x61, 0x41, 0x01, -1, -1, -1, -1, -1, @@ -275,14 +312,14 @@ /* 0x3A : option */ { KBD_MOD_MAP_LOPT, }, /* 0x3B : left */ - { KBD_MAP_NONE, }, + { KBD_MOD_MAP(KBD_SEQUENCE(KEY_LEFT)), }, /* 0x3C : right */ - { KBD_MAP_NONE, }, + { KBD_MOD_MAP(KBD_SEQUENCE(KEY_RIGHT)), }, /* 0x3D : down */ - { KBD_MAP_NONE, }, + { KBD_MOD_MAP(KBD_SEQUENCE(KEY_DOWN)), }, /* 0x3E : up */ + { KBD_MOD_MAP(KBD_SEQUENCE(KEY_UP)), }, { KBD_MAP_NONE, }, - { KBD_MAP_NONE, }, /* 0x40 */ { KBD_MAP_NONE, }, { KBD_SH_NUML, { 0x7F, 0x2E, -1, -1, -1, -1, -1, -1, @@ -368,55 +405,55 @@ { KBD_MOD_MAP(0x2F), }, { KBD_MAP_NONE, }, /* 0x60 : F5 */ - { KBD_MAP_NONE, }, + { KBD_MOD_MAP(KBD_SEQUENCE(KEY_F5)), }, /* 0x61 : F6 */ - { KBD_MAP_NONE, }, + { KBD_MOD_MAP(KBD_SEQUENCE(KEY_F6)), }, /* 0x62 : F7 */ - { KBD_MAP_NONE, }, + { KBD_MOD_MAP(KBD_SEQUENCE(KEY_F7)), }, /* 0x63 : F3 */ - { KBD_MAP_NONE, }, + { KBD_MOD_MAP(KBD_SEQUENCE(KEY_F3)), }, /* 0x64 : F8 */ - { KBD_MAP_NONE, }, + { KBD_MOD_MAP(KBD_SEQUENCE(KEY_F8)), }, /* 0x65 : F9 */ + { KBD_MOD_MAP(KBD_SEQUENCE(KEY_F9)), }, { KBD_MAP_NONE, }, - { KBD_MAP_NONE, }, /* 0x67 : F11 */ - { KBD_MAP_NONE, }, + { KBD_MOD_MAP(KBD_SEQUENCE(KEY_F11)), }, /* 0x68 */ { KBD_MAP_NONE, }, /* 0x69 : F13 */ + { KBD_MOD_MAP(KBD_SEQUENCE(KEY_F13)), }, { KBD_MAP_NONE, }, - { KBD_MAP_NONE, }, /* 0x6B : F14 */ + { KBD_MOD_MAP(KBD_SEQUENCE(KEY_F14)), }, { KBD_MAP_NONE, }, - { KBD_MAP_NONE, }, /* 0x6D : F10 */ + { KBD_MOD_MAP(KBD_SEQUENCE(KEY_F10)), }, { KBD_MAP_NONE, }, - { KBD_MAP_NONE, }, /* 0x6F : F12 */ - { KBD_MAP_NONE, }, + { KBD_MOD_MAP(KBD_SEQUENCE(KEY_F12)), }, /* 0x70 */ { KBD_MAP_NONE, }, /* 0x71 : F15 */ - { KBD_MAP_NONE, }, + { KBD_MOD_MAP(KBD_SEQUENCE(KEY_F15)), }, /* 0x72 : help */ - { KBD_MAP_NONE, }, + { KBD_MOD_MAP(KBD_SEQUENCE(KEY_HELP)), }, /* 0x73 : home */ - { KBD_MAP_NONE, }, + { KBD_MOD_MAP(KBD_SEQUENCE(KEY_HOME)), }, /* 0x74 : page up */ - { KBD_MAP_NONE, }, + { KBD_MOD_MAP(KBD_SEQUENCE(KEY_PAGE_UP)), }, /* 0x75 : del */ - { KBD_MAP_NONE, }, + { KBD_MOD_MAP(KBD_SEQUENCE(KEY_DELETE)), }, /* 0x76 : F4 */ - { KBD_MAP_NONE, }, + { KBD_MOD_MAP(KBD_SEQUENCE(KEY_F4)), }, /* 0x77 : end */ - { KBD_MAP_NONE, }, + { KBD_MOD_MAP(KBD_SEQUENCE(KEY_END)), }, /* 0x78 : F2 */ - { KBD_MAP_NONE, }, + { KBD_MOD_MAP(KBD_SEQUENCE(KEY_F2)), }, /* 0x79 : page down */ - { KBD_MAP_NONE, }, + { KBD_MOD_MAP(KBD_SEQUENCE(KEY_PAGE_UP)), }, /* 0x7A : F1 */ - { KBD_MAP_NONE, }, + { KBD_MOD_MAP(KBD_SEQUENCE(KEY_F1)), }, /* 0x7B : right shift */ { KBD_MOD_MAP_RSHIFT, }, /* 0x7C : right option */ @@ -432,6 +469,8 @@ struct adb_kbd_t { kbd_t kbd; int next_key; + char sequence[ADB_MAX_SEQUENCE_LEN]; + int len; }; static adb_dev_t *my_adb_dev = NULL; @@ -445,6 +484,13 @@ int ret; kbd = (void *)dev->state; + + if (kbd->len > 0) { + ret = kbd->sequence[kbd->len-- - 1]; + ADB_DPRINTF("Buffered %d (%02x)\n", ret, ret); + return ret; + } + /* Get saved state */ ret = -1; for (key = -1; key == -1; ) { @@ -457,7 +503,12 @@ kbd->next_key = buffer[1] == 0xFF ? -1 : buffer[1]; key = buffer[0]; } - ret = kbd_translate_key(&kbd->kbd, key & 0x7F, key >> 7); + ret = kbd_translate_key(&kbd->kbd, key & 0x7F, key >> 7, kbd->sequence); + if (ret > 0) { + kbd->len = ret; + ret = kbd->sequence[kbd->len-- - 1]; + } + ADB_DPRINTF("Translated %d (%02x) into %d (%02x)\n", key, key, ret, ret); } @@ -477,8 +528,9 @@ if (kbd != NULL) { memset(kbd, 0, sizeof(adb_kbd_t)); kbd_set_keymap(&kbd->kbd, sizeof(ADB_kbd_us) / sizeof(keymap_t), - ADB_kbd_us); + ADB_kbd_us, ADB_sequences); kbd->next_key = -1; + kbd->len = 0; dev->state = (int32_t)kbd; my_adb_dev = dev; } Modified: trunk/openbios-devel/drivers/kbd.c =================================================================== --- trunk/openbios-devel/drivers/kbd.c 2009-11-05 21:39:58 UTC (rev 596) +++ trunk/openbios-devel/drivers/kbd.c 2009-11-06 21:23:32 UTC (rev 597) @@ -20,6 +20,7 @@ */ #include "openbios/config.h" +#include "libc/string.h" #include "asm/types.h" #include "kbd.h" @@ -31,15 +32,16 @@ #define KBD_DPRINTF(fmt, args...) do { } while (0) #endif -int kbd_set_keymap (kbd_t *kbd, int nb_keys, const keymap_t *keymap) +int kbd_set_keymap (kbd_t *kbd, int nb_keys, const keymap_t *keymap, const char **sequences) { kbd->nb_keys = nb_keys; kbd->keymap = keymap; + kbd->sequences = sequences; return 0; } -int kbd_translate_key (kbd_t *kbd, int keycode, int up_down) +int kbd_translate_key (kbd_t *kbd, int keycode, int up_down, char *sequence) { const keymap_t *keyt; int mod_state, key, type; @@ -70,9 +72,17 @@ case KBD_TYPE_REGULAR: if (!up_down) { /* We don't care about up events on "normal" keys */ - ret = key; + *sequence = key; + ret = 1; } break; + case KBD_TYPE_SEQUENCE: + if (!up_down) { + /* We don't care about up events on "normal" keys */ + ret = strlen(kbd->sequences[key]); + memcpy(sequence, kbd->sequences[key], ret); + } + break; case KBD_TYPE_LOCK: if (!up_down) { kbd->mod_state ^= key; Modified: trunk/openbios-devel/drivers/kbd.h =================================================================== --- trunk/openbios-devel/drivers/kbd.h 2009-11-05 21:39:58 UTC (rev 596) +++ trunk/openbios-devel/drivers/kbd.h 2009-11-06 21:23:32 UTC (rev 597) @@ -35,6 +35,7 @@ */ int nb_keys; const keymap_t *keymap; + const char **sequences; }; /* Modifiers */ @@ -62,12 +63,15 @@ } kbd_lck_shifts; enum { - KBD_TYPE_REGULAR = 0 << 24, - KBD_TYPE_LMOD = 1 << 24, - KBD_TYPE_RMOD = 2 << 24, - KBD_TYPE_LOCK = 3 << 24, + KBD_TYPE_REGULAR = 0 << 24, + KBD_TYPE_LMOD = 1 << 24, + KBD_TYPE_RMOD = 2 << 24, + KBD_TYPE_LOCK = 3 << 24, + KBD_TYPE_SEQUENCE = 4 << 24, }; +#define KBD_SEQUENCE(sequence) (KBD_TYPE_SEQUENCE | (sequence)) + #define KBD_MOD_MAP(mod) \ KBD_SH_NONE, { (mod), (mod), (mod), (mod), (mod), (mod), (mod), (mod), \ (mod), (mod), (mod), (mod), (mod), (mod), (mod), (mod), \ @@ -97,7 +101,8 @@ }; void *kbd_new (int len); -int kbd_set_keymap (kbd_t *kbd, int nb_keys, const keymap_t *keymap); -int kbd_translate_key (kbd_t *kbd, int keycode, int up_down); +int kbd_set_keymap (kbd_t *kbd, int nb_keys, const keymap_t *keymap, + const char **sequences); +int kbd_translate_key (kbd_t *kbd, int keycode, int up_down, char *sequence); #endif /* !defined (__OHW_KBD_H__) */

1 0

r596 - trunk/openbios-devel/modules
by svn＠openbios.org 05 Nov '09

05 Nov '09

Author: laurent Date: 2009-11-05 21:39:58 +0000 (Thu, 05 Nov 2009) New Revision: 596 Modified: trunk/openbios-devel/modules/cmdline.c Log: Allow to move on command line and in history using the arrow keys. (with -nographic) Signed-off-by: Laurent Vivier <Laurent(a)vivier.eu> Modified: trunk/openbios-devel/modules/cmdline.c =================================================================== --- trunk/openbios-devel/modules/cmdline.c 2009-11-05 20:51:15 UTC (rev 595) +++ trunk/openbios-devel/modules/cmdline.c 2009-11-05 21:39:58 UTC (rev 596) @@ -198,7 +198,8 @@ cur_added = prompt = histind = pos = n = 0; } - switch( (ch=key()) ) { + ch = key(); + switch( ch ) { case 27: switch( key() ) { case 'f': @@ -217,6 +218,30 @@ move_cursor( -1 ); pos--; } + break; + case '[': + switch( key() ) { + case 'A': + goto go_up; + case 'B': + goto go_down; + case 'C': + goto go_right; + case 'D': + goto go_left; + case '3': + key(); + goto delete; + } + break; + case 'O': + switch(key()) { + case 'F': + goto go_end; + case 'H': + goto go_home; + } + break; } break; case '\n': @@ -240,6 +265,7 @@ break; case 4: /* ^d */ +delete: if( pos == n ) break; emit( buf[pos++] ); @@ -260,17 +286,20 @@ break; case 1: /* ^a */ +go_home: move_cursor( -pos ); pos = 0; break; case 5: /* ^e */ +go_end: pos += emit_str( &buf[pos] ); break; //case 68: /* left */ // drop = 1; case 2: /* ^b */ +go_left: if( pos ) { move_cursor( -1 ); pos--; @@ -280,6 +309,7 @@ //case 67: /* right */ // drop = 1; case 6: /* ^f */ +go_right: if( pos < n ) emit( buf[pos++] ); break; @@ -316,6 +346,7 @@ //case 66: /* down */ // drop = 1; case 14: /* ^n */ +go_down: if( !histind ) break; history_get( ci, --histind ); @@ -331,6 +362,7 @@ //case 65: /* up */ // drop = 1; case 16: /* ^p */ +go_up: if( !histind && add_to_history(ci, ci->buf) ) { cur_added = 1; histind++;

1 0

r595 - trunk/openbios-devel/drivers
by svn＠openbios.org 05 Nov '09

05 Nov '09

Author: laurent Date: 2009-11-05 20:51:15 +0000 (Thu, 05 Nov 2009) New Revision: 595 Modified: trunk/openbios-devel/drivers/adb_kbd.c Log: Add management of "ctrl-" for ADB keyboard. On PPC, allow to navigate through command line history and current line with: ctrl-p, ctrl-n, ctrl-f, ctrl-b, ctrl-d, ctrl-c, ctrl-k, ctrl-y... Signed-off-by: Laurent Vivier <Laurent(a)vivier.eu> Modified: trunk/openbios-devel/drivers/adb_kbd.c =================================================================== --- trunk/openbios-devel/drivers/adb_kbd.c 2009-11-05 20:22:21 UTC (rev 594) +++ trunk/openbios-devel/drivers/adb_kbd.c 2009-11-05 20:51:15 UTC (rev 595) @@ -56,77 +56,77 @@ static const keymap_t ADB_kbd_us[] = { /* 0x00 */ - { KBD_SH_CAPS, { 0x61, 0x41, -1, -1, -1, -1, -1, -1, + { KBD_SH_CAPS, { 0x61, 0x41, 0x01, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, }, - { KBD_SH_CAPS, { 0x73, 0x53, -1, -1, -1, -1, -1, -1, + { KBD_SH_CAPS, { 0x73, 0x53, 0x13, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, }, - { KBD_SH_CAPS, { 0x64, 0x44, -1, -1, -1, -1, -1, -1, + { KBD_SH_CAPS, { 0x64, 0x44, 0x04, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, }, - { KBD_SH_CAPS, { 0x66, 0x46, -1, -1, -1, -1, -1, -1, + { KBD_SH_CAPS, { 0x66, 0x46, 0x06, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, }, - { KBD_SH_CAPS, { 0x68, 0x48, -1, -1, -1, -1, -1, -1, + { KBD_SH_CAPS, { 0x68, 0x48, 0x08, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, }, - { KBD_SH_CAPS, { 0x67, 0x47, -1, -1, -1, -1, -1, -1, + { KBD_SH_CAPS, { 0x67, 0x47, 0x07, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, }, - { KBD_SH_CAPS, { 0x7A, 0x5A, -1, -1, -1, -1, -1, -1, + { KBD_SH_CAPS, { 0x7A, 0x5A, 0x1A, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, }, - { KBD_SH_CAPS, { 0x78, 0x58, -1, -1, -1, -1, -1, -1, + { KBD_SH_CAPS, { 0x78, 0x58, 0x18, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, }, /* 0x08 */ - { KBD_SH_CAPS, { 0x63, 0x43, -1, -1, -1, -1, -1, -1, + { KBD_SH_CAPS, { 0x63, 0x43, 0x03, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, }, - { KBD_SH_CAPS, { 0x76, 0x56, -1, -1, -1, -1, -1, -1, + { KBD_SH_CAPS, { 0x76, 0x56, 0x16, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, }, - { KBD_SH_CAPS, { 0x60, 0x40, -1, -1, -1, -1, -1, -1, /* ? */ + { KBD_SH_CAPS, { 0x60, 0x40, 0x00, -1, -1, -1, -1, -1, /* ? */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, }, - { KBD_SH_CAPS, { 0x62, 0x42, -1, -1, -1, -1, -1, -1, + { KBD_SH_CAPS, { 0x62, 0x42, 0x02, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, }, - { KBD_SH_CAPS, { 0x71, 0x51, -1, -1, -1, -1, -1, -1, + { KBD_SH_CAPS, { 0x71, 0x51, 0x11, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, }, - { KBD_SH_CAPS, { 0x77, 0x57, -1, -1, -1, -1, -1, -1, + { KBD_SH_CAPS, { 0x77, 0x57, 0x17, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, }, - { KBD_SH_CAPS, { 0x65, 0x45, -1, -1, -1, -1, -1, -1, + { KBD_SH_CAPS, { 0x65, 0x45, 0x05, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, }, - { KBD_SH_CAPS, { 0x72, 0x52, -1, -1, -1, -1, -1, -1, + { KBD_SH_CAPS, { 0x72, 0x52, 0x12, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, }, /* 0x10 */ - { KBD_SH_CAPS, { 0x79, 0x59, -1, -1, -1, -1, -1, -1, + { KBD_SH_CAPS, { 0x79, 0x59, 0x19, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, }, - { KBD_SH_CAPS, { 0x74, 0x54, -1, -1, -1, -1, -1, -1, + { KBD_SH_CAPS, { 0x74, 0x54, 0x14, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, }, @@ -134,7 +134,7 @@ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, }, - { KBD_SH_CAPS, { 0x32, 0x40, -1, -1, -1, -1, -1, -1, + { KBD_SH_CAPS, { 0x32, 0x40, 0x00, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, }, @@ -146,7 +146,7 @@ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, }, - { KBD_SH_CAPS, { 0x36, 0x5E, -1, -1, -1, -1, -1, -1, + { KBD_SH_CAPS, { 0x36, 0x5E, 0x1E, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, }, @@ -167,7 +167,7 @@ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, }, - { KBD_SH_CAPS, { 0x2D, 0x5F, -1, -1, -1, -1, -1, -1, + { KBD_SH_CAPS, { 0x2D, 0x5F, 0x1F, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, }, @@ -183,12 +183,12 @@ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, }, - { KBD_SH_CAPS, { 0x6F, 0x4F, -1, -1, -1, -1, -1, -1, + { KBD_SH_CAPS, { 0x6F, 0x4F, 0x0F, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, }, /* 0x20 */ - { KBD_SH_CAPS, { 0x75, 0x55, -1, -1, -1, -1, -1, -1, + { KBD_SH_CAPS, { 0x75, 0x55, 0x15, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, }, @@ -196,20 +196,20 @@ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, }, - { KBD_SH_CAPS, { 0x69, 0x49, -1, -1, -1, -1, -1, -1, + { KBD_SH_CAPS, { 0x69, 0x49, 0x09, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, }, - { KBD_SH_CAPS, { 0x70, 0x50, -1, -1, -1, -1, -1, -1, + { KBD_SH_CAPS, { 0x70, 0x50, 0x10, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, }, { KBD_MOD_MAP(0x0D), }, - { KBD_SH_CAPS, { 0x6C, 0x4C, -1, -1, -1, -1, -1, -1, + { KBD_SH_CAPS, { 0x6C, 0x4C, 0x0C, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, }, - { KBD_SH_CAPS, { 0x6A, 0x4A, -1, -1, -1, -1, -1, -1, + { KBD_SH_CAPS, { 0x6A, 0x4A, 0x0A, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, }, @@ -218,7 +218,7 @@ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, }, /* 0x28 */ - { KBD_SH_CAPS, { 0x6B, 0x4B, -1, -1, -1, -1, -1, -1, + { KBD_SH_CAPS, { 0x6B, 0x4B, 0x0B, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, }, @@ -238,11 +238,11 @@ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, }, - { KBD_SH_CAPS, { 0x6E, 0x4E, -1, -1, -1, -1, -1, -1, + { KBD_SH_CAPS, { 0x6E, 0x4E, 0x0E, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, }, - { KBD_SH_CAPS, { 0x6D, 0x4D, -1, -1, -1, -1, -1, -1, + { KBD_SH_CAPS, { 0x6D, 0x4D, 0x0D, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, },

1 0

r594 - trunk/openbios-devel/drivers
by svn＠openbios.org 05 Nov '09

05 Nov '09

Author: laurent Date: 2009-11-05 20:22:21 +0000 (Thu, 05 Nov 2009) New Revision: 594 Modified: trunk/openbios-devel/drivers/kbd.c Log: printk() needs openbios/config.h Modified: trunk/openbios-devel/drivers/kbd.c =================================================================== --- trunk/openbios-devel/drivers/kbd.c 2009-11-02 22:35:59 UTC (rev 593) +++ trunk/openbios-devel/drivers/kbd.c 2009-11-05 20:22:21 UTC (rev 594) @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA */ +#include "openbios/config.h" #include "asm/types.h" #include "kbd.h"

1 0

Re: [OpenBIOS] PATCH: Implement Forth source debugger for OpenBIOS
by Laurent Vivier 04 Nov '09

04 Nov '09

>Laurent Vivier wrote: > >(lots cut) > >> 4- forth/admin/iocontrol.fs:install-console >> >> ... >> ['] io-emit to emit >> ... >> >> where io-emit is: >> >> : io-emit ( char -- ) >> io-out-char c! >> io-out-char 1 " write" stdout @ $call-method drop >> ; >> >> And stdout is defined in arch/ppc/qemu/init.c:arch_of_init() (see 2- ) > >Thank you - now I see that the defer word "emit" is not set to execute >the C function emit, which is what was confusing me. In fact the C function "emit()" is linked to the forth function "(emit)" which is set to the defer forth word "emit", and the forth word "emit" is redefined later to use the good package method. Regards, Laurent -- --------------------- Laurent(a)vivier.eu --------------------- "Tout ce qui est impossible reste à accomplir" Jules Verne "Things are only impossible until they're not" Jean-Luc Picard

1 0

Re: [OpenBIOS] PATCH: Implement Forth source debugger for OpenBIOS
by Laurent Vivier 04 Nov '09

04 Nov '09

>Laurent Vivier wrote: > >>> In the meantime, I've looked again at the v2 patch I posted and I still >>> can't work out why the debugging output by printk() doesn't appear on a >>> VNC display for Qemu SPARC64, while it appears fine when Qemu SPARC64 is >>> invoked in -nographic mode. Can anyone shed any light on this? >> >> Because "printk()" are sent to serial and must use only for debug purpose. >> You must use forth words like "emit" or "type" to send characters to >display. For instance, look at "modules/cmdline.c": >> >> static void >> emit( int ch ) >> { >> PUSH( ch ); >> fword("emit"); >> } >> >> static int >> emit_str( const char *str ) >> { >> int n = 0; >> while( *str ) { >> n++; >> emit( *str++ ); >> } >> return n; >> } > >Yeah, I did consider that this might be the case but it still doesn't >seem to make sense looking at the code. The source for the forth emit >word can be found in kernel/forth.c: > > >/* > * emit ( char -- ) > */ > >static void emit(void) >{ >#ifndef FCOMPILER > cell tmp = POP(); > putchar(tmp); >#else > (void) POP(); >#endif >} > > >while for SPARC64 the source for printk() can be found in >arch/sparc64/lib.c: > > >/* Format a string and print it on the screen, just like the libc > * function printf. > */ >int printk( const char *fmt, ... ) >{ > char *p, buf[512]; > va_list args; > int i; > > va_start(args, fmt); > i = vsnprintf(buf, sizeof(buf), fmt, args); > va_end(args); > > for( p=buf; *p; p++ ) > putchar(*p); > return i; >} > > >Both of these use putchar() in order to write characters out to the >console, and yet one of them works in a graphical terminal and one of >them doesn't... > But "emit" is redefined later to "io-emit" which use "stdout" which can be serial or graphic: 0- arch/ppc/qemu/start.S:_entry (this is the bootstrap) ... bl entry ... 1- arch/ppc/qemu/init.c:entry() ... initialize_forth(); ... 2- arch/ppc/qemu/kernel.c:initialize_forth() ... PUSH_xt( bind_noname_func(arch_of_init) ); fword("PREPOST-initializer"); PC = (ucell)findword("initialize-of"); ... 3- forth/system/main.fs:initialize-of ... install-console ... 4- forth/admin/iocontrol.fs:install-console ... ['] io-emit to emit ... where io-emit is: : io-emit ( char -- ) io-out-char c! io-out-char 1 " write" stdout @ $call-method drop ; And stdout is defined in arch/ppc/qemu/init.c:arch_of_init() (see 2- ) Regards, Laurent -- --------------------- Laurent(a)vivier.eu --------------------- "Tout ce qui est impossible reste à accomplir" Jules Verne "Things are only impossible until they're not" Jean-Luc Picard

2 1

Re: [OpenBIOS] PATCH: Implement Forth source debugger for OpenBIOS
by Laurent Vivier 04 Nov '09

04 Nov '09

>Blue Swirl wrote: > >> That's possible. >> >> But I think the performance hit could be avoided almost entirely. Make >> non-debug and debug versions of "semis" and "docol". On startup >> construct the "words" table, while building select the non-debug >> versions, unless some magic diagnostic switch is on. "next" or >> "enterforth" may still need a test. >> >> Maybe the switch to debug table could even happen during execution by >> user command. > >Indeed. I had a similar inspiration earlier this evening, with the only >problem being how to switch code into next() without causing a >performance hit. However, I think I've just worked out a cute little >hack that would solve this. I'm at a conference over the next few days, >so it might not be until next week that I get a chance re-work the patch >and resubmit. > >In the meantime, I've looked again at the v2 patch I posted and I still >can't work out why the debugging output by printk() doesn't appear on a >VNC display for Qemu SPARC64, while it appears fine when Qemu SPARC64 is >invoked in -nographic mode. Can anyone shed any light on this? Because "printk()" are sent to serial and must use only for debug purpose. You must use forth words like "emit" or "type" to send characters to display. For instance, look at "modules/cmdline.c": static void emit( int ch ) { PUSH( ch ); fword("emit"); } static int emit_str( const char *str ) { int n = 0; while( *str ) { n++; emit( *str++ ); } return n; } I think we could use also a "fword(type)" instead of the "emit_str()" (see forth/bootstrap/bootstrap.fs). Regards, Laurent -- --------------------- Laurent(a)vivier.eu --------------------- "Tout ce qui est impossible reste à accomplir" Jules Verne "Things are only impossible until they're not" Jean-Luc Picard

2 1

r593 - trunk/openbios-devel/modules
by svn＠openbios.org 02 Nov '09

02 Nov '09

Author: laurent Date: 2009-11-02 23:35:59 +0100 (Mon, 02 Nov 2009) New Revision: 593 Modified: trunk/openbios-devel/modules/filesystems.c Log: load: manage file size smaller than 512 bytes Allow to load bootinfo scripts of haiku and FreeBSD. Signed-off-by: Laurent Vivier <Laurent(a)vivier.eu> Modified: trunk/openbios-devel/modules/filesystems.c =================================================================== --- trunk/openbios-devel/modules/filesystems.c 2009-11-02 22:17:40 UTC (rev 592) +++ trunk/openbios-devel/modules/filesystems.c 2009-11-02 22:35:59 UTC (rev 593) @@ -259,11 +259,13 @@ size = 0; while(1) { ret = mi->fs->read( mi->file, buf, 512 ); - if (ret != 512) + if (ret <= 0) break; buf += ret; mi->filepos += ret; size += ret; + if (ret != 512) + break; } PUSH( size ); }

1 0

r592 - trunk/openbios-devel/modules
by svn＠openbios.org 02 Nov '09

02 Nov '09

Author: laurent Date: 2009-11-02 23:17:40 +0100 (Mon, 02 Nov 2009) New Revision: 592 Modified: trunk/openbios-devel/modules/client.c Log: client interface: add verbosity in traces Signed-off-by: Laurent Vivier <Laurent(a)vivier.eu> Modified: trunk/openbios-devel/modules/client.c =================================================================== --- trunk/openbios-devel/modules/client.c 2009-11-01 23:27:35 UTC (rev 591) +++ trunk/openbios-devel/modules/client.c 2009-11-02 22:17:40 UTC (rev 592) @@ -36,7 +36,179 @@ ulong args[10]; /* MAX NUM ARGS! */ } prom_args_t; +#ifdef DEBUG_CIF +static void memdump(const char *mem, unsigned long size) +{ + int i; + + if (size == (unsigned long) -1) + return; + for (i = 0; i < size; i += 16) { + int j; + + printk("0x%08lx ", (unsigned long)mem + i); + + for (j = 0; j < 16 && i + j < size; j++) + printk(" %02x", *(unsigned char*)(mem + i + j)); + + for ( ; j < 16; j++) + printk(" __"); + + printk(" "); + + for (j = 0; j < 16 && i + j < size; j++) { + unsigned char c = *(mem + i + j); + if (isprint(c)) + printk("%c", c); + else + printk("."); + } + printk("\n"); + } +} + +static void dump_service(prom_args_t *pb) +{ + int i; + printk("[ nargs %ld nret %ld ] ", pb->nargs, pb->nret); + if (strcmp(pb->service, "test") == 0) { + printk("test(\"%s\") = ", (char*)pb->args[0]); + } else if (strcmp(pb->service, "peer") == 0) { + printk("peer(0x%08lx) = ", pb->args[0]); + } else if (strcmp(pb->service, "child") == 0) { + printk("child(0x%08lx) = ", pb->args[0]); + } else if (strcmp(pb->service, "parent") == 0) { + printk("parent(0x%08lx) = ", pb->args[0]); + } else if (strcmp(pb->service, "instance-to-package") == 0) { + printk("instance-to-package(0x%08lx) = ", pb->args[0]); + } else if (strcmp(pb->service, "getproplen") == 0) { + printk("getproplen(0x%08lx, \"%s\") = ", + pb->args[0], (char*)pb->args[1]); + } else if (strcmp(pb->service, "getprop") == 0) { + printk("getprop(0x%08lx, \"%s\", 0x%08lx, %ld) = ", + pb->args[0], (char*)pb->args[1], + pb->args[2], pb->args[3]); + } else if (strcmp(pb->service, "nextprop") == 0) { + printk("nextprop(0x%08lx, \"%s\", 0x%08lx) = ", + pb->args[0], (char*)pb->args[1], pb->args[2]); + } else if (strcmp(pb->service, "setprop") == 0) { + printk("setprop(0x%08lx, \"%s\", 0x%08lx, %ld)\n", + pb->args[0], (char*)pb->args[1], + pb->args[2], pb->args[3]); + memdump((char*)pb->args[2], pb->args[3]); + printk(" = "); + } else if (strcmp(pb->service, "canon") == 0) { + printk("canon(\"%s\", 0x%08lx, %ld)\n", + (char*)pb->args[0], pb->args[1], pb->args[2]); + } else if (strcmp(pb->service, "finddevice") == 0) { + printk("finddevice(\"%s\") = ", (char*)pb->args[0]); + } else if (strcmp(pb->service, "instance-to-path") == 0) { + printk("instance-to-path(0x%08lx, 0x%08lx, %ld) = ", + pb->args[0], pb->args[1], pb->args[2]); + } else if (strcmp(pb->service, "package-to-path") == 0) { + printk("package-to-path(0x%08lx, 0x%08lx, %ld) = ", + pb->args[0], pb->args[1], pb->args[2]); + } else if (strcmp(pb->service, "open") == 0) { + printk("open(\"%s\") = ", (char*)pb->args[0]); + } else if (strcmp(pb->service, "close") == 0) { + printk("close(0x%08lx)\n", pb->args[0]); + } else if (strcmp(pb->service, "read") == 0) { + printk("read(0x%08lx, 0x%08lx, %ld) = ", + pb->args[0], pb->args[1], pb->args[2]); + } else if (strcmp(pb->service, "write") == 0) { + printk("write(0x%08lx, 0x%08lx, %ld)\n", + pb->args[0], pb->args[1], pb->args[2]); + memdump((char*)pb->args[1], pb->args[2]); + printk(" = "); + } else if (strcmp(pb->service, "seek") == 0) { + printk("seek(0x%08lx, 0x%08lx, 0x%08lx) = ", + pb->args[0], pb->args[1], pb->args[2]); + } else if (strcmp(pb->service, "claim") == 0) { + printk("claim(0x8%lx, %ld, %ld) = ", + pb->args[0], pb->args[1], pb->args[2]); + } else if (strcmp(pb->service, "release") == 0) { + printk("release(0x8%lx, %ld)\n", + pb->args[0], pb->args[1]); + } else if (strcmp(pb->service, "boot") == 0) { + printk("boot \"%s\"\n", (char*)pb->args[0]); + } else if (strcmp(pb->service, "enter") == 0) { + printk("enter()\n"); + } else if (strcmp(pb->service, "exit") == 0) { + printk("exit()\n"); + } else { + printk("of_client_interface: %s ", pb->service ); + for( i = 0; i < pb->nargs; i++ ) + printk("%lx ", pb->args[i] ); + printk("\n"); + } +} + +static void dump_return(prom_args_t *pb) +{ + int i; + if (strcmp(pb->service, "test") == 0) { + printk(" %ld\n", pb->args[pb->nargs]); + } else if (strcmp(pb->service, "peer") == 0) { + printk("0x%08lx\n", pb->args[pb->nargs]); + } else if (strcmp(pb->service, "child") == 0) { + printk("0x%08lx\n", pb->args[pb->nargs]); + } else if (strcmp(pb->service, "parent") == 0) { + printk("0x%08lx\n", pb->args[pb->nargs]); + } else if (strcmp(pb->service, "instance-to-package") == 0) { + printk("0x%08lx\n", pb->args[pb->nargs]); + } else if (strcmp(pb->service, "getproplen") == 0) { + printk("0x%08lx\n", pb->args[pb->nargs]); + } else if (strcmp(pb->service, "getprop") == 0) { + printk("%ld\n", pb->args[pb->nargs]); + memdump((char*)pb->args[2], pb->args[pb->nargs]); + } else if (strcmp(pb->service, "nextprop") == 0) { + printk("%ld\n", pb->args[pb->nargs]); + memdump((char*)pb->args[2], pb->args[pb->nargs]); + } else if (strcmp(pb->service, "setprop") == 0) { + printk("%ld\n", pb->args[pb->nargs]); + } else if (strcmp(pb->service, "canon") == 0) { + printk("%ld\n", pb->args[pb->nargs]); + memdump((char*)pb->args[1], pb->args[pb->nargs]); + } else if (strcmp(pb->service, "finddevice") == 0) { + printk("0x%08lx\n", pb->args[pb->nargs]); + } else if (strcmp(pb->service, "instance-to-path") == 0) { + printk("%ld\n", pb->args[pb->nargs]); + memdump((char*)pb->args[1], pb->args[pb->nargs]); + } else if (strcmp(pb->service, "package-to-path") == 0) { + printk("%ld\n", pb->args[pb->nargs]); + memdump((char*)pb->args[1], pb->args[pb->nargs]); + } else if (strcmp(pb->service, "open") == 0) { + printk("0x%08lx\n", pb->args[pb->nargs]); + } else if (strcmp(pb->service, "close") == 0) { + /* do nothing */ + } else if (strcmp(pb->service, "read") == 0) { + printk("%ld\n", pb->args[pb->nargs]); + memdump((char*)pb->args[1], pb->args[pb->nargs]); + } else if (strcmp(pb->service, "write") == 0) { + printk("%ld\n", pb->args[pb->nargs]); + } else if (strcmp(pb->service, "seek") == 0) { + printk("%ld\n", pb->args[pb->nargs]); + } else if (strcmp(pb->service, "claim") == 0) { + printk("0x%08lx\n", pb->args[pb->nargs]); + } else if (strcmp(pb->service, "release") == 0) { + /* do nothing */ + } else if (strcmp(pb->service, "boot") == 0) { + /* do nothing */ + } else if (strcmp(pb->service, "enter") == 0) { + /* do nothing */ + } else if (strcmp(pb->service, "exit") == 0) { + /* do nothing */ + } else { + printk("of_client_interface return:"); + for (i = 0; i < pb->nret; i++) { + printk("%lx ", pb->args[pb->nargs + i]); + } + printk("\n"); + } +} +#endif + /* call-method, interpret */ static int handle_calls( prom_args_t *pb ) @@ -89,10 +261,7 @@ if( pb->nargs < 0 || pb->nret < 0 ) return -1; #ifdef DEBUG_CIF - printk("of_client_interface: %s ", pb->service ); - for( i=0; i<pb->nargs; i++ ) - printk("%lx ", pb->args[i] ); - printk("\n"); + dump_service(pb); #endif /* call-method exceptions are special */ @@ -124,11 +293,7 @@ dstackcnt = dstacksave; } - printk("of_client_interface return:"); - for (i = 0; i < pb->nret; i++) { - printk("%lx ", pb->args[pb->nargs + i]); - } - printk("\n"); + dump_return(pb); #endif return 0; }

1 0

← Newer
1
2
3
4
5
6
7
8
9
Older →