vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

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

Browse source 
ARCS. All users updated.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2013-04-30 17:40:31 +02:00
parent aa7bcb99df
commit 583e5b645c
4 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -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> 2013-04-30 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/kern/mips/loongson/init.c: Support halt for loongson 2E. * grub-core/kern/mips/loongson/init.c: Support halt for loongson 2E.

6
grub-core/kern/mips/arc/init.c
View file

@ -45,7 +45,11 @@ const char *type_names[] = {
"eisa", "tc", "scsi", "dti", "multi", "disk", "tape", "cdrom", "worm", "eisa", "tc", "scsi", "dti", "multi", "disk", "tape", "cdrom", "worm",
"serial", "net", "video", "par", "point", "key", "audio", "other", "serial", "net", "video", "par", "point", "key", "audio", "other",
"rdisk", "fdisk", "tape", "modem", "monitor", "print", "pointer", "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 static int

10
grub-core/term/arc/console.c
View file

@ -61,7 +61,7 @@ grub_arc_is_device_serial (const char *name, int alt_names)
/* /*
Recognize: Recognize:
serial(N) serial(N)
serial(N)other(M) serial(N)line(M)
*/ */
for (i = 0; i < 2; i++) 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), && grub_memcmp (ptr + 1 - (sizeof ("serial") - 1),
"serial", sizeof ("serial") - 1) == 0) "serial", sizeof ("serial") - 1) == 0)
return 1; return 1;
if (!(ptr + 1 >= name + sizeof ("other") - 1 if (!(ptr + 1 >= name + sizeof ("line") - 1
&& grub_memcmp (ptr + 1 - (sizeof ("other") - 1), && grub_memcmp (ptr + 1 - (sizeof ("line") - 1),
"other", sizeof ("other") - 1) == 0)) "line", sizeof ("line") - 1) == 0))
return 0; return 0;
ptr -= sizeof ("other") - 1; ptr -= sizeof ("line") - 1;
if (alt_names) if (alt_names)
{ {
if (*ptr != '/') if (*ptr != '/')

2
include/grub/arc/arc.h
View file

@ -139,7 +139,9 @@ enum
GRUB_ARC_COMPONENT_TYPE_POINTER, GRUB_ARC_COMPONENT_TYPE_POINTER,
GRUB_ARC_COMPONENT_TYPE_KBD, GRUB_ARC_COMPONENT_TYPE_KBD,
GRUB_ARC_COMPONENT_TYPE_TERMINAL, GRUB_ARC_COMPONENT_TYPE_TERMINAL,
#ifndef GRUB_CPU_WORDS_BIGENDIAN
GRUB_ARC_COMPONENT_TYPE_OTHER_PERIPHERAL, GRUB_ARC_COMPONENT_TYPE_OTHER_PERIPHERAL,
#endif
GRUB_ARC_COMPONENT_TYPE_LINE, GRUB_ARC_COMPONENT_TYPE_LINE,
GRUB_ARC_COMPONENT_TYPE_NET, GRUB_ARC_COMPONENT_TYPE_NET,
GRUB_ARC_COMPONENT_TYPE_MEMORY_UNIT, GRUB_ARC_COMPONENT_TYPE_MEMORY_UNIT,