[PATCH 02/10] sparc no longer needs and special keyboard handling. it uses the standard api's interfaces

[Dennis Gilmore <dennis@xxxxxxxx>]

---
 loader/kbd.c |   25 +------------------------
 1 files changed, 1 insertions(+), 24 deletions(-)

diff --git a/loader/kbd.c b/loader/kbd.c
index 94b6858..191f91d 100644
--- a/loader/kbd.c
+++ b/loader/kbd.c
@@ -61,20 +61,6 @@ int chooseKeyboard(struct loaderData_s * loaderData, char ** kbdtypep) {
 
     if (FL_SERIAL (flags) || FL_VIRTPCONSOLE(flags)) return LOADER_NOOP;
 
-#ifdef __sparc__
-    {
-        int fd;
-        
-	fd = open("/dev/kbd", O_RDWR);
-	if (fd < 0)
-	    kbdtype = KBDTYPE_PC; /* if PC keyboard, then there is no driver for /dev/kbd */
-	else {
-	    close(fd);
-	    kbdtype = KBDTYPE_SUN;
-	}
-    }
-#endif /* sparc */
-
     numLanguages = getLangInfo(&languages);
 
     lang = getenv("LANG");
@@ -91,12 +77,7 @@ int chooseKeyboard(struct loaderData_s * loaderData, char ** kbdtypep) {
     }
 
     if (!defkbd)
-#ifdef __sparc__
-	if (kbdtype == KBDTYPE_SUN)
-	    defkbd = "sunkeymap";
-	else
-#endif /* sparc drain bamage */
-	    defkbd = "us";
+	defkbd = "us";
 
     f = gunzip_open("/etc/keymaps.gz");
     if (!f) {
@@ -168,10 +149,6 @@ int chooseKeyboard(struct loaderData_s * loaderData, char ** kbdtypep) {
 
     loaderData->kbd = strdup(infoTable[num].name);
 
-#ifdef __sparc__
-    if (kbdtypep) *kbdtypep = (kbdtype == KBDTYPE_SUN) ? "sun" : "pc";
-#endif
-
     return rc;
 }
 
-- 
1.6.2.5

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list