* include/grub/arc/arc.h: Account for missing "other" peripheral on

	ARCS. All users updated.

diff --git a/ChangeLog b/ChangeLog
index 6b5feff559bf88611547c445f7d1acd25c612278..b924457921c807ce72571663039b368a8798f108 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-04-30  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * include/grub/arc/arc.h: Account for missing "other" peripheral on
+       ARCS. All users updated.
+
 2013-04-30  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * grub-core/kern/mips/loongson/init.c: Support halt for loongson 2E.

diff --git a/grub-core/kern/mips/arc/init.c b/grub-core/kern/mips/arc/init.c
index fdcc2bd22a1f2fb990a42c07d3ed274caa072629..ddee814c5d71c1e50331e045bb6c3819c7298869 100644 (file)
--- a/grub-core/kern/mips/arc/init.c
+++ b/grub-core/kern/mips/arc/init.c
@@ -45,7 +45,11 @@ const char *type_names[] = {
   "eisa", "tc", "scsi", "dti", "multi", "disk", "tape", "cdrom", "worm",
   "serial", "net", "video", "par", "point", "key", "audio", "other",
   "rdisk", "fdisk", "tape", "modem", "monitor", "print", "pointer",
-  "keyboard", "term", "other", "line", "network", NULL
+  "keyboard", "term",
+#ifndef GRUB_CPU_WORDS_BIGENDIAN
+  "other",
+#endif
+  "line", "network", NULL
 };
 
 static int

diff --git a/grub-core/term/arc/console.c b/grub-core/term/arc/console.c
index ea4737cb4d954f2e955585893acee020c63b65be..df099f05ae8b22cc95c245f7fa207a15df3395cc 100644 (file)
--- a/grub-core/term/arc/console.c
+++ b/grub-core/term/arc/console.c
@@ -61,7 +61,7 @@ grub_arc_is_device_serial (const char *name, int alt_names)
   /*
     Recognize:
     serial(N)
-    serial(N)other(M)
+    serial(N)line(M)
    */
   for (i = 0; i < 2; i++)
     {
@@ -84,11 +84,11 @@ grub_arc_is_device_serial (const char *name, int alt_names)
          && grub_memcmp (ptr + 1 - (sizeof ("serial") - 1),
                          "serial", sizeof ("serial") - 1) == 0)
        return 1;
-      if (!(ptr + 1 >= name + sizeof ("other") - 1
-           && grub_memcmp (ptr + 1 - (sizeof ("other") - 1),
-                           "other", sizeof ("other") - 1) == 0))
+      if (!(ptr + 1 >= name + sizeof ("line") - 1
+           && grub_memcmp (ptr + 1 - (sizeof ("line") - 1),
+                           "line", sizeof ("line") - 1) == 0))
        return 0;
-      ptr -= sizeof ("other") - 1;
+      ptr -= sizeof ("line") - 1;
       if (alt_names)
        {
          if (*ptr != '/')

diff --git a/include/grub/arc/arc.h b/include/grub/arc/arc.h
index c2578f4151ccd6ed23664c50094b72afeafff860..7615a49a92cac0ac16326c188e438b789b09acec 100644 (file)
--- a/include/grub/arc/arc.h
+++ b/include/grub/arc/arc.h
@@ -139,7 +139,9 @@ enum
     GRUB_ARC_COMPONENT_TYPE_POINTER,
     GRUB_ARC_COMPONENT_TYPE_KBD,
     GRUB_ARC_COMPONENT_TYPE_TERMINAL,
+#ifndef GRUB_CPU_WORDS_BIGENDIAN
     GRUB_ARC_COMPONENT_TYPE_OTHER_PERIPHERAL,
+#endif
     GRUB_ARC_COMPONENT_TYPE_LINE,
     GRUB_ARC_COMPONENT_TYPE_NET,
     GRUB_ARC_COMPONENT_TYPE_MEMORY_UNIT,