Macintosh-SW/EMILE
1
0
Fork 0
mirror of https://github.com/vivier/EMILE.git synced 2024-06-02 00:41:45 +00:00
Code Issues Projects Releases Wiki Activity

move cli.c to libui/edit.c

Browse Source
This commit is contained in:
Laurent Vivier 2007-09-17 23:31:17 +00:00
parent 62904d7c71
commit c7d9742b8a
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
second/Makefile
View File

@ -30,7 +30,7 @@ LIBS = $(OPT_LIBS) -L$(TOP)/../libiso9660/m68k-linux \
LS = ls
AWK = awk
HEADERS = arch.h bank.h bootenv.h bootinfo.h bootx.h cli.h console.h driver.h enter_kernel030.h enter_kernel040.h enter_kernel.h enter_kernelnoMMU.h switch_to_PPC.h head.h keyboard.h load.h misc.h MMU030.h MMU040.h serial.h vga.h config.h copymem.i
HEADERS = arch.h bank.h bootenv.h bootinfo.h bootx.h console.h driver.h enter_kernel030.h enter_kernel040.h enter_kernel.h enter_kernelnoMMU.h switch_to_PPC.h head.h keyboard.h load.h misc.h MMU030.h MMU040.h serial.h vga.h config.h copymem.i
SOURCES = head.S main.c console.c \
font_8x16.c \
@ -38,7 +38,7 @@ SOURCES = head.S main.c console.c \
load.c serial.c vga.c driver.c \
enter_kernel.c config.c
SOURCES_CLI = keyboard.c cli.c
SOURCES_CLI = keyboard.c
OBJS = $(patsubst %.c,%.o,$(SOURCES:.S=.o)) $(SOURCES_CLI:.c=.o) \
$(OPTOBJS)

13
second/config.c
View File

@ -16,7 +16,6 @@
#include "config.h"
#if defined(USE_CLI) && defined(__LINUX__)
#include "console.h"
#include "cli.h"
#endif
#include "arch.h"
#include "misc.h"
@ -24,15 +23,15 @@
#include "vga.h"
#include "serial.h"
#define MSG_STATE_0 console_set_cursor_position(5, 1); \
#define MSG_STATE_0 console_set_cursor_position(win.l + win.h + 1, 1); \
printf(" Press 'b' or [RETURN] to boot or 'e' to edit\n");
#define MSG_STATE_1 console_set_cursor_position(3, 1); \
#define MSG_STATE_1 console_set_cursor_position(win.l + win.h + 1, 1); \
printf(" Press 'b' to boot, 'e' or [RETURN] to edit \n" \
" Press 'd' to delete, 'n' to create \n" \
" Press [ESC] to go back \n");
#define MSG_CLEAN console_set_cursor_position(3, 1); \
#define MSG_CLEAN console_set_cursor_position(win.l + win.h + 1, 1); \
printf(" \n" \
" \n" \
" \n");
@ -275,7 +274,7 @@ int read_config(emile_l2_header_t* info,
#if defined(USE_CLI) && defined(__LINUX__)
state = 0;
win.l = 7;
win.l = 4;
win.c = 4;
win.h = l - 16;
win.w = c - 8;
@ -354,9 +353,9 @@ int read_config(emile_l2_header_t* info,
memset(property, 0, COMMAND_LINE_LENGTH);
strncpy(property, properties[choice][list.current], COMMAND_LINE_LENGTH);
free(properties[choice][list.current]);
console_set_cursor_position(win.l + win.h + 2, 3);
console_set_cursor_position(win.l + win.h + 1, 3);
console_cursor_on();
cli_edit(property, COMMAND_LINE_LENGTH);
emile_edit(property, COMMAND_LINE_LENGTH);
console_cursor_off();
properties[choice][list.current] = strdup(property);
console_set_cursor_position(win.l + win.h + 2, 3);