Aren/rulimine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

readline: Unify getchar() impl for UEFI and BIOS

Browse Source
This commit is contained in:
mintsuki 2022-03-02 15:15:22 +01:00
parent 8525bd8369
commit 90d67a3c4c
1 changed files with 13 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
common/lib/readline.c
View File

@ -13,6 +13,15 @@
#include <drivers/serial.h> #include <drivers/serial.h>
#include <sys/cpu.h> #include <sys/cpu.h>
int getchar(void) {
for (;;) {
int ret = pit_sleep_and_quit_on_keypress(65535);
if (ret != 0) {
return ret;
}
}
}
int getchar_internal(uint8_t scancode, uint8_t ascii, uint32_t shift_state) { int getchar_internal(uint8_t scancode, uint8_t ascii, uint32_t shift_state) {
switch (scancode) { switch (scancode) {
#if bios == 1 #if bios == 1
@ -90,15 +99,6 @@ int getchar_internal(uint8_t scancode, uint8_t ascii, uint32_t shift_state) {
} }
#if bios == 1 #if bios == 1
int getchar(void) {
for (;;) {
int ret = pit_sleep_and_quit_on_keypress(65535);
if (ret != 0) {
return ret;
}
}
}
int _pit_sleep_and_quit_on_keypress(uint32_t ticks); int _pit_sleep_and_quit_on_keypress(uint32_t ticks);
static int input_sequence(void) { static int input_sequence(void) {
@ -154,6 +154,10 @@ static int input_sequence(void) {
} }
int pit_sleep_and_quit_on_keypress(int seconds) { int pit_sleep_and_quit_on_keypress(int seconds) {
if (!serial) {
return _pit_sleep_and_quit_on_keypress(seconds * 18);
}
for (int i = 0; i < seconds * 18; i++) { for (int i = 0; i < seconds * 18; i++) {
int ret = _pit_sleep_and_quit_on_keypress(1); int ret = _pit_sleep_and_quit_on_keypress(1);
@ -161,10 +165,6 @@ int pit_sleep_and_quit_on_keypress(int seconds) {
return ret; return ret;
} }
if (!serial) {
continue;
}
ret = serial_in(); ret = serial_in();
if (ret != -1) { if (ret != -1) {
@ -249,15 +249,6 @@ static int input_sequence(bool ext,
return 0; return 0;
} }
int getchar(void) {
for (;;) {
int ret = pit_sleep_and_quit_on_keypress(65535);
if (ret != 0) {
return ret;
}
}
}
int pit_sleep_and_quit_on_keypress(int seconds) { int pit_sleep_and_quit_on_keypress(int seconds) {
EFI_KEY_DATA kd; EFI_KEY_DATA kd;