Blame SOURCES/0038-grub-core-term-terminfo.c-Only-fix-up-powerpc-key-re.patch

f96e0b
From 5ba7247c064336767ee6b0ad9465b547ac90322a Mon Sep 17 00:00:00 2001
f96e0b
From: Colin Watson <cjwatson@ubuntu.com>
f96e0b
Date: Fri, 14 Sep 2012 11:23:36 +0100
f96e0b
Subject: [PATCH 038/482] * grub-core/term/terminfo.c: Only fix up powerpc key
f96e0b
 repeat on IEEE1275 machines.  Fixes powerpc-emu compilation. *
f96e0b
 include/grub/terminfo.h: Likewise.
f96e0b
f96e0b
---
f96e0b
 ChangeLog                 | 6 ++++++
f96e0b
 grub-core/term/terminfo.c | 6 +++---
f96e0b
 include/grub/terminfo.h   | 2 +-
f96e0b
 3 files changed, 10 insertions(+), 4 deletions(-)
f96e0b
f96e0b
diff --git a/ChangeLog b/ChangeLog
f96e0b
index 527e9d1..941ed93 100644
f96e0b
--- a/ChangeLog
f96e0b
+++ b/ChangeLog
f96e0b
@@ -1,3 +1,9 @@
f96e0b
+2012-09-14  Colin Watson  <cjwatson@ubuntu.com>
f96e0b
+
f96e0b
+	* grub-core/term/terminfo.c: Only fix up powerpc key repeat on
f96e0b
+	IEEE1275 machines.  Fixes powerpc-emu compilation.
f96e0b
+	* include/grub/terminfo.h: Likewise.
f96e0b
+
f96e0b
 2012-09-12  Vladimir Serbinenko  <phcoder@gmail.com>
f96e0b
 
f96e0b
 	* include/grub/efi/api.h (grub_efi_runtime_services): Make vendor_guid
f96e0b
diff --git a/grub-core/term/terminfo.c b/grub-core/term/terminfo.c
f96e0b
index e35563f..d421e4e 100644
f96e0b
--- a/grub-core/term/terminfo.c
f96e0b
+++ b/grub-core/term/terminfo.c
f96e0b
@@ -33,7 +33,7 @@
f96e0b
 #include <grub/extcmd.h>
f96e0b
 #include <grub/i18n.h>
f96e0b
 #include <grub/time.h>
f96e0b
-#ifdef __powerpc__
f96e0b
+#if defined(__powerpc__) && defined(GRUB_MACHINE_IEEE1275)
f96e0b
 #include <grub/ieee1275/ieee1275.h>
f96e0b
 #endif
f96e0b
 
f96e0b
@@ -563,7 +563,7 @@ grub_terminfo_getkey (struct grub_term_input *termi)
f96e0b
   grub_terminfo_readkey (termi, data->input_buf,
f96e0b
 			 &data->npending, data->readkey);
f96e0b
 
f96e0b
-#ifdef __powerpc__
f96e0b
+#if defined(__powerpc__) && defined(GRUB_MACHINE_IEEE1275)
f96e0b
   if (data->npending == 1 && data->input_buf[0] == '\e'
f96e0b
       && grub_ieee1275_test_flag (GRUB_IEEE1275_FLAG_BROKEN_REPEAT)
f96e0b
       && grub_get_time_ms () - data->last_key_time < 1000
f96e0b
@@ -580,7 +580,7 @@ grub_terminfo_getkey (struct grub_term_input *termi)
f96e0b
       int ret;
f96e0b
       data->npending--;
f96e0b
       ret = data->input_buf[0];
f96e0b
-#ifdef __powerpc__
f96e0b
+#if defined(__powerpc__) && defined(GRUB_MACHINE_IEEE1275)
f96e0b
       if (grub_ieee1275_test_flag (GRUB_IEEE1275_FLAG_BROKEN_REPEAT))
f96e0b
 	{
f96e0b
 	  data->last_key = ret;
f96e0b
diff --git a/include/grub/terminfo.h b/include/grub/terminfo.h
f96e0b
index c081a92..20541a9 100644
f96e0b
--- a/include/grub/terminfo.h
f96e0b
+++ b/include/grub/terminfo.h
f96e0b
@@ -32,7 +32,7 @@ struct grub_terminfo_input_state
f96e0b
 {
f96e0b
   int input_buf[GRUB_TERMINFO_READKEY_MAX_LEN];
f96e0b
   int npending;
f96e0b
-#ifdef __powerpc__
f96e0b
+#if defined(__powerpc__) && defined(GRUB_MACHINE_IEEE1275)
f96e0b
   int last_key;
f96e0b
   grub_uint64_t last_key_time;
f96e0b
 #endif
f96e0b
-- 
f96e0b
1.8.2.1
f96e0b