RaySollium99/picodrive
1
0
Fork 0
mirror of https://github.com/RaySollium99/picodrive.git synced 2025-09-05 15:27:46 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

oshide: drop termios dump/restore, OS already handles that

Browse source 
git-svn-id: file:///home/notaz/opt/svn/PicoDrive@875 be3aeb3a-fb24-0410-a615-afba39da0efa
This commit is contained in:
notaz 2010-05-31 22:18:25 +00:00
parent be672de78d
commit 234f07f4a4
2 changed files with 9 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

12
platform/linux/oshide.c
View file

@ -15,7 +15,6 @@
#include <linux/kd.h>
#define PFX "oshide: "
#define TERMIOS_DUMP_FILE "/tmp/pico_tios"
#define FPTR(f) typeof(f) * p##f
#define FPTR_LINK(xf, dl, f) { \
@ -169,7 +168,6 @@ static int g_kbdfd;
static void hidecon_start(void)
{
struct termios kbd_termios;
FILE *tios_f;
int mode;
g_kbdfd = open("/dev/tty", O_RDWR);
@ -188,14 +186,6 @@ static void hidecon_start(void)
goto fail;
}
/* dump for picorestore */
g_kbd_termios_saved = kbd_termios;
tios_f = fopen(TERMIOS_DUMP_FILE, "wb");
if (tios_f) {
fwrite(&kbd_termios, sizeof(kbd_termios), 1, tios_f);
fclose(tios_f);
}
kbd_termios.c_lflag &= ~(ICANON | ECHO); // | ISIG);
kbd_termios.c_iflag &= ~(ISTRIP | IGNCR | ICRNL | INLCR | IXOFF | IXON);
kbd_termios.c_cc[VMIN] = 0;
@ -230,8 +220,6 @@ static void hidecon_end(void)
if (tcsetattr(g_kbdfd, TCSAFLUSH, &g_kbd_termios_saved) == -1)
perror(PFX "tcsetattr");
remove(TERMIOS_DUMP_FILE);
close(g_kbdfd);
g_kbdfd = -1;
}

33
platform/pandora/picorestore.c
View file

@ -5,15 +5,12 @@
#include <unistd.h>
#include <sys/ioctl.h>
#include <linux/fb.h>
#include <termios.h>
#include <linux/kd.h>
int main()
{
struct fb_var_screeninfo fbvar;
struct termios kbd_termios;
int ret, fbdev, kbdfd;
FILE *tios_f;
fbdev = open("/dev/fb0", O_RDWR);
if (fbdev == -1) {
@ -40,28 +37,16 @@ int main()
end_fb:
close(fbdev);
tios_f = fopen("/tmp/pico_tios", "rb");
if (tios_f != NULL) {
kbdfd = open("/dev/tty", O_RDWR);
if (kbdfd == -1) {
perror("open /dev/tty");
return 1;
}
if (fread(&kbd_termios, sizeof(kbd_termios), 1, tios_f) == 1) {
if (ioctl(kbdfd, KDSETMODE, KD_TEXT) == -1)
perror("KDSETMODE KD_TEXT");
printf("restoring termios.. ");
if (tcsetattr(kbdfd, TCSAFLUSH, &kbd_termios) == -1)
perror("tcsetattr");
else
printf("ok\n");
}
close(kbdfd);
fclose(tios_f);
kbdfd = open("/dev/tty", O_RDWR);
if (kbdfd == -1) {
perror("open /dev/tty");
return 1;
}
if (ioctl(kbdfd, KDSETMODE, KD_TEXT) == -1)
perror("KDSETMODE KD_TEXT");
close(kbdfd);
return 0;
}