Adding upstream version 2.06.upstream/2.06upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

3 files changed, 873 insertions, 0 deletions

diff --git a/grub-core/term/ieee1275/console.c b/grub-core/term/ieee1275/console.c
new file mode 100644
index 0000000..7e797a7
--- /dev/null
+++ b/grub-core/term/ieee1275/console.c
@@ -0,0 +1,267 @@
+/*  console.c -- Open Firmware console for GRUB.  */
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2003,2004,2005,2007,2008,2009  Free Software Foundation, Inc.
+ *
+ *  GRUB is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  GRUB is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <grub/term.h>
+#include <grub/types.h>
+#include <grub/misc.h>
+#include <grub/mm.h>
+#include <grub/time.h>
+#include <grub/terminfo.h>
+#include <grub/ieee1275/console.h>
+#include <grub/ieee1275/ieee1275.h>
+
+static grub_ieee1275_ihandle_t stdout_ihandle;
+static grub_ieee1275_ihandle_t stdin_ihandle;
+
+extern struct grub_terminfo_output_state grub_console_terminfo_output;
+
+struct color
+{
+  int red;
+  int green;
+  int blue;
+};
+
+/* Use serial colors as they are default on most firmwares and some firmwares
+   ignore set-color!. Additionally output may be redirected to serial.  */
+static struct color colors[] =
+  {
+    // {R, G, B}
+    {0x00, 0x00, 0x00}, // 0 = black
+    {0xA8, 0x00, 0x00}, // 1 = red
+    {0x00, 0xA8, 0x00}, // 2 = green
+    {0xFE, 0xFE, 0x54}, // 3 = yellow
+    {0x00, 0x00, 0xA8}, // 4 = blue
+    {0xA8, 0x00, 0xA8}, // 5 = magenta
+    {0x00, 0xA8, 0xA8}, // 6 = cyan
+    {0xFE, 0xFE, 0xFE}  // 7 = white
+  };
+
+static void
+put (struct grub_term_output *term __attribute__ ((unused)), const int c)
+{
+  char chr = c;
+
+  grub_ieee1275_write (stdout_ihandle, &chr, 1, 0);
+}
+
+static int
+readkey (struct grub_term_input *term __attribute__ ((unused)))
+{
+  grub_uint8_t c;
+  grub_ssize_t actual = 0;
+
+  grub_ieee1275_read (stdin_ihandle, &c, 1, &actual);
+  if (actual > 0)
+    return c;
+  return -1;
+}
+
+static void
+grub_console_dimensions (void)
+{
+  grub_ieee1275_ihandle_t options;
+  grub_ieee1275_phandle_t stdout_phandle;
+  char val[1024];
+
+  /* Always assume 80x24 on serial since screen-#rows/screen-#columns is often
+     garbage for such devices.  */
+  if (! grub_ieee1275_instance_to_package (stdout_ihandle,
+					   &stdout_phandle)
+      && ! grub_ieee1275_package_to_path (stdout_phandle,
+					  val, sizeof (val) - 1, 0))
+    {
+      grub_ieee1275_ihandle_t stdout_options;
+      val[sizeof (val) - 1] = 0;      
+
+      if (! grub_ieee1275_finddevice (val, &stdout_options)
+	  && ! grub_ieee1275_get_property (stdout_options, "device_type",
+					   val, sizeof (val) - 1, 0))
+	{
+	  val[sizeof (val) - 1] = 0;
+	  if (grub_strcmp (val, "serial") == 0)
+	    {
+	      grub_console_terminfo_output.size.x = 80;
+	      grub_console_terminfo_output.size.y = 24;
+	      return;
+	    }
+	}
+    }
+
+  if (! grub_ieee1275_finddevice ("/options", &options)
+      && options != (grub_ieee1275_ihandle_t) -1)
+    {
+      if (! grub_ieee1275_get_property (options, "screen-#columns",
+					val, sizeof (val) - 1, 0))
+	{
+	  val[sizeof (val) - 1] = 0;
+	  grub_console_terminfo_output.size.x
+	    = (grub_uint8_t) grub_strtoul (val, 0, 10);
+	}
+      if (! grub_ieee1275_get_property (options, "screen-#rows",
+					val, sizeof (val) - 1, 0))
+	{
+	  val[sizeof (val) - 1] = 0;
+	  grub_console_terminfo_output.size.y
+	    = (grub_uint8_t) grub_strtoul (val, 0, 10);
+	}
+    }
+
+  /* Bogus default value on SLOF in QEMU.  */
+  if (grub_console_terminfo_output.size.x == 200
+      && grub_console_terminfo_output.size.y == 200)
+    {
+      grub_console_terminfo_output.size.x = 80;
+      grub_console_terminfo_output.size.y = 24;
+    }
+
+  /* Use a small console by default.  */
+  if (! grub_console_terminfo_output.size.x)
+    grub_console_terminfo_output.size.x = 80;
+  if (! grub_console_terminfo_output.size.y)
+    grub_console_terminfo_output.size.y = 24;
+}
+
+static void
+grub_console_setcursor (struct grub_term_output *term,
+			  int on)
+{
+  grub_terminfo_setcursor (term, on);
+
+  if (!grub_ieee1275_test_flag (GRUB_IEEE1275_FLAG_HAS_CURSORONOFF))
+    return;
+
+  /* Understood by the Open Firmware flavour in OLPC.  */
+  if (on)
+    grub_ieee1275_interpret ("cursor-on", 0);
+  else
+    grub_ieee1275_interpret ("cursor-off", 0);
+}
+
+static grub_err_t
+grub_console_init_input (struct grub_term_input *term)
+{
+  grub_ssize_t actual;
+
+  if (grub_ieee1275_get_integer_property (grub_ieee1275_chosen, "stdin", &stdin_ihandle,
+					  sizeof stdin_ihandle, &actual)
+      || actual != sizeof stdin_ihandle)
+    return grub_error (GRUB_ERR_UNKNOWN_DEVICE, "cannot find stdin");
+
+  return grub_terminfo_input_init (term);
+}
+
+static grub_err_t
+grub_console_init_output (struct grub_term_output *term)
+{
+  grub_ssize_t actual;
+
+  /* The latest PowerMacs don't actually initialize the screen for us, so we
+   * use this trick to re-open the output device (but we avoid doing this on
+   * platforms where it's known to be broken). */
+  if (! grub_ieee1275_test_flag (GRUB_IEEE1275_FLAG_BROKEN_OUTPUT))
+    grub_ieee1275_interpret ("output-device output", 0);
+
+  if (grub_ieee1275_get_integer_property (grub_ieee1275_chosen, "stdout", &stdout_ihandle,
+					  sizeof stdout_ihandle, &actual)
+      || actual != sizeof stdout_ihandle)
+    return grub_error (GRUB_ERR_UNKNOWN_DEVICE, "cannot find stdout");
+
+  /* Initialize colors.  */
+  if (! grub_ieee1275_test_flag (GRUB_IEEE1275_FLAG_CANNOT_SET_COLORS))
+    {
+      unsigned col;
+      for (col = 0; col < ARRAY_SIZE (colors); col++)
+	grub_ieee1275_set_color (stdout_ihandle, col, colors[col].red,
+				 colors[col].green, colors[col].blue);
+
+      /* Set the right fg and bg colors.  */
+      grub_terminfo_setcolorstate (term, GRUB_TERM_COLOR_NORMAL);
+    }
+
+  grub_console_dimensions ();
+
+  grub_terminfo_output_init (term);
+
+  return 0;
+}
+
+
+
+struct grub_terminfo_input_state grub_console_terminfo_input =
+  {
+    .readkey = readkey
+  };
+
+struct grub_terminfo_output_state grub_console_terminfo_output =
+  {
+    .put = put,
+    .size = { 80, 24 }
+  };
+
+static struct grub_term_input grub_console_term_input =
+  {
+    .name = "console",
+    .init = grub_console_init_input,
+    .getkey = grub_terminfo_getkey,
+    .data = &grub_console_terminfo_input
+  };
+
+static struct grub_term_output grub_console_term_output =
+  {
+    .name = "console",
+    .init = grub_console_init_output,
+    .putchar = grub_terminfo_putchar,
+    .getxy = grub_terminfo_getxy,
+    .getwh = grub_terminfo_getwh,
+    .gotoxy = grub_terminfo_gotoxy,
+    .cls = grub_terminfo_cls,
+    .setcolorstate = grub_terminfo_setcolorstate,
+    .setcursor = grub_console_setcursor,
+    .flags = GRUB_TERM_CODE_TYPE_ASCII,
+    .data = &grub_console_terminfo_output,
+    .progress_update_divisor = GRUB_PROGRESS_FAST
+  };
+
+void
+grub_console_init_early (void)
+{
+  grub_term_register_input ("console", &grub_console_term_input);
+  grub_term_register_output ("console", &grub_console_term_output);
+}
+
+void
+grub_console_init_lately (void)
+{
+  const char *type;
+
+  if (grub_ieee1275_test_flag (GRUB_IEEE1275_FLAG_NO_ANSI))
+    type = "dumb";
+  else if (grub_ieee1275_test_flag (GRUB_IEEE1275_FLAG_CURSORONOFF_ANSI_BROKEN))
+    type = "ieee1275-nocursor";
+  else
+    type = "ieee1275";
+  grub_terminfo_init ();
+  grub_terminfo_output_register (&grub_console_term_output, type);
+}
+
+void
+grub_console_fini (void)
+{
+}
diff --git a/grub-core/term/ieee1275/escc.c b/grub-core/term/ieee1275/escc.c
new file mode 100644
index 0000000..e605ff2
--- /dev/null
+++ b/grub-core/term/ieee1275/escc.c
@@ -0,0 +1,319 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2012  Free Software Foundation, Inc.
+ *
+ *  GRUB is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  GRUB is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <grub/serial.h>
+#include <grub/types.h>
+#include <grub/dl.h>
+#include <grub/misc.h>
+#include <grub/mm.h>
+#include <grub/time.h>
+#include <grub/i18n.h>
+
+GRUB_MOD_LICENSE ("GPLv3+");
+
+struct grub_escc_descriptor
+{
+  volatile grub_uint8_t *escc_ctrl;
+  volatile grub_uint8_t *escc_data;
+};
+
+static void
+do_real_config (struct grub_serial_port *port)
+{
+  grub_uint8_t bitsspec;
+  grub_uint8_t parity_stop_spec;
+  if (port->configured)
+    return;
+
+  /* Make sure the port is waiting for address now.  */
+  (void) *port->escc_desc->escc_ctrl;
+  switch (port->config.speed)
+    {
+    case 57600:
+      *port->escc_desc->escc_ctrl = 13;
+      *port->escc_desc->escc_ctrl = 0;
+      *port->escc_desc->escc_ctrl = 12;
+      *port->escc_desc->escc_ctrl = 0;
+      *port->escc_desc->escc_ctrl = 14;
+      *port->escc_desc->escc_ctrl = 1;
+      *port->escc_desc->escc_ctrl = 11;
+      *port->escc_desc->escc_ctrl = 0x50;
+      break;
+    case 38400:
+      *port->escc_desc->escc_ctrl = 13;
+      *port->escc_desc->escc_ctrl = 0;
+      *port->escc_desc->escc_ctrl = 12;
+      *port->escc_desc->escc_ctrl = 1;
+      *port->escc_desc->escc_ctrl = 14;
+      *port->escc_desc->escc_ctrl = 1;
+      *port->escc_desc->escc_ctrl = 11;
+      *port->escc_desc->escc_ctrl = 0x50;
+      break;
+    }
+
+  parity_stop_spec = 0;
+  switch (port->config.parity)
+    {
+    case GRUB_SERIAL_PARITY_NONE:
+      parity_stop_spec |= 0;
+      break;
+    case GRUB_SERIAL_PARITY_ODD:
+      parity_stop_spec |= 1;
+      break;
+    case GRUB_SERIAL_PARITY_EVEN:
+      parity_stop_spec |= 3;
+      break;
+    }
+
+  switch (port->config.stop_bits)
+    {
+    case GRUB_SERIAL_STOP_BITS_1:
+      parity_stop_spec |= 0x4;
+      break;
+    case GRUB_SERIAL_STOP_BITS_1_5:
+      parity_stop_spec |= 0x8;
+      break;
+    case GRUB_SERIAL_STOP_BITS_2:
+      parity_stop_spec |= 0xc;
+      break;      
+    }
+
+  *port->escc_desc->escc_ctrl = 4;
+  *port->escc_desc->escc_ctrl = 0x40 | parity_stop_spec;
+
+  bitsspec = port->config.word_len - 5;
+  bitsspec = ((bitsspec >> 1) | (bitsspec << 1)) & 3;
+
+  *port->escc_desc->escc_ctrl = 3;
+  *port->escc_desc->escc_ctrl = (bitsspec << 6) | 0x1;
+
+  port->configured = 1;
+
+  return;
+}
+
+/* Fetch a key.  */
+static int
+serial_hw_fetch (struct grub_serial_port *port)
+{
+  do_real_config (port);
+
+  *port->escc_desc->escc_ctrl = 0;
+  if (*port->escc_desc->escc_ctrl & 1)
+    return *port->escc_desc->escc_data;
+  return -1;
+}
+
+/* Put a character.  */
+static void
+serial_hw_put (struct grub_serial_port *port, const int c)
+{
+  grub_uint64_t endtime;
+
+  do_real_config (port);
+
+  if (port->broken > 5)
+    endtime = grub_get_time_ms ();
+  else if (port->broken > 1)
+    endtime = grub_get_time_ms () + 50;
+  else
+    endtime = grub_get_time_ms () + 200;
+  /* Wait until the transmitter holding register is empty.  */
+  while (1)
+    {
+      *port->escc_desc->escc_ctrl = 0;
+      if (*port->escc_desc->escc_ctrl & 4)
+	break;
+      if (grub_get_time_ms () > endtime)
+	{
+	  port->broken++;
+	  /* There is something wrong. But what can I do?  */
+	  return;
+	}
+    }
+
+  if (port->broken)
+    port->broken--;
+
+  *port->escc_desc->escc_data = c;
+}
+
+/* Initialize a serial device. PORT is the port number for a serial device.
+   SPEED is a DTE-DTE speed which must be one of these: 2400, 4800, 9600,
+   19200, 38400, 57600 and 115200. WORD_LEN is the word length to be used
+   for the device. Likewise, PARITY is the type of the parity and
+   STOP_BIT_LEN is the length of the stop bit. The possible values for
+   WORD_LEN, PARITY and STOP_BIT_LEN are defined in the header file as
+   macros.  */
+static grub_err_t
+serial_hw_configure (struct grub_serial_port *port __attribute__ ((unused)),
+		     struct grub_serial_config *config __attribute__ ((unused)))
+{
+  if (config->speed != 38400 && config->speed != 57600)
+    return grub_error (GRUB_ERR_BAD_ARGUMENT,
+		       N_("unsupported serial port speed"));
+
+  if (config->parity != GRUB_SERIAL_PARITY_NONE
+      && config->parity != GRUB_SERIAL_PARITY_ODD
+      && config->parity != GRUB_SERIAL_PARITY_EVEN)
+    return grub_error (GRUB_ERR_BAD_ARGUMENT,
+		       N_("unsupported serial port parity"));
+
+  if (config->stop_bits != GRUB_SERIAL_STOP_BITS_1
+      && config->stop_bits != GRUB_SERIAL_STOP_BITS_1_5
+      && config->stop_bits != GRUB_SERIAL_STOP_BITS_2)
+    return grub_error (GRUB_ERR_BAD_ARGUMENT,
+		       N_("unsupported serial port stop bits number"));
+
+  if (config->word_len < 5 || config->word_len > 8)
+    return grub_error (GRUB_ERR_BAD_ARGUMENT,
+		       N_("unsupported serial port word length"));
+
+  port->config = *config;
+  port->configured = 0;
+
+  /*  FIXME: should check if the serial terminal was found.  */
+
+  return GRUB_ERR_NONE;
+}
+
+struct grub_serial_driver grub_escc_driver =
+  {
+    .configure = serial_hw_configure,
+    .fetch = serial_hw_fetch,
+    .put = serial_hw_put
+  };
+
+static struct grub_escc_descriptor escc_descs[2];
+static char *macio = 0;
+
+static void
+add_device (grub_addr_t addr, int channel)
+{
+  struct grub_serial_port *port;
+  grub_err_t err;
+  struct grub_serial_config config =
+    {
+      .speed = 38400,
+      .word_len = 8,
+      .parity = GRUB_SERIAL_PARITY_NONE,
+      .stop_bits = GRUB_SERIAL_STOP_BITS_1
+    };
+
+  escc_descs[channel].escc_ctrl
+    = (volatile grub_uint8_t *) (grub_addr_t) addr;
+  escc_descs[channel].escc_data = escc_descs[channel].escc_ctrl + 16;
+
+  port = grub_zalloc (sizeof (*port));
+  if (!port)
+    {
+      grub_errno = 0;
+      return;
+    }
+
+  port->name = grub_xasprintf ("escc-ch-%c", channel + 'a');
+  if (!port->name)
+    {
+      grub_errno = 0;
+      return;
+    }
+
+  port->escc_desc = &escc_descs[channel];
+
+  port->driver = &grub_escc_driver;
+
+  err = port->driver->configure (port, &config);
+  if (err)
+    grub_print_error ();
+
+  grub_serial_register (port);
+}
+
+static int
+find_macio (struct grub_ieee1275_devalias *alias)
+{
+  if (grub_strcmp (alias->type, "mac-io") != 0)
+    return 0;
+  macio = grub_strdup (alias->path);
+  return 1;
+}
+
+GRUB_MOD_INIT (escc)
+{
+  grub_uint32_t macio_addr[4];
+  grub_uint32_t escc_addr[2];
+  grub_ieee1275_phandle_t dev;
+  struct grub_ieee1275_devalias alias;
+  char *escc = 0;
+
+  grub_ieee1275_devices_iterate (find_macio);
+  if (!macio)
+    return;
+
+  FOR_IEEE1275_DEVCHILDREN(macio, alias)
+    if (grub_strcmp (alias.type, "escc") == 0)
+      {
+	escc = grub_strdup (alias.path);
+	break;
+      }
+  grub_ieee1275_devalias_free (&alias);
+  if (!escc)
+    {
+      grub_free (macio);
+      return;
+    }
+
+  if (grub_ieee1275_finddevice (macio, &dev))
+    {
+      grub_free (macio);
+      grub_free (escc);
+      return;
+    }
+  if (grub_ieee1275_get_integer_property (dev, "assigned-addresses",
+					  macio_addr, sizeof (macio_addr), 0))
+    {
+      grub_free (macio);
+      grub_free (escc);
+      return;
+    }
+
+  if (grub_ieee1275_finddevice (escc, &dev))
+    {
+      grub_free (macio);
+      grub_free (escc);
+      return;
+    }
+
+  if (grub_ieee1275_get_integer_property (dev, "reg",
+					  escc_addr, sizeof (escc_addr), 0))
+    {
+      grub_free (macio);
+      grub_free (escc);
+      return;
+    }
+
+  add_device (macio_addr[2] + escc_addr[0] + 32, 0);
+  add_device (macio_addr[2] + escc_addr[0], 1);
+
+  grub_free (macio);
+  grub_free (escc);
+}
+
+GRUB_MOD_FINI (escc)
+{
+}
diff --git a/grub-core/term/ieee1275/serial.c b/grub-core/term/ieee1275/serial.c
new file mode 100644
index 0000000..9e71ca4
--- /dev/null
+++ b/grub-core/term/ieee1275/serial.c
@@ -0,0 +1,287 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2012  Free Software Foundation, Inc.
+ *
+ *  GRUB is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  GRUB is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <grub/serial.h>
+#include <grub/types.h>
+#include <grub/dl.h>
+#include <grub/misc.h>
+#include <grub/mm.h>
+#include <grub/time.h>
+#include <grub/i18n.h>
+#include <grub/ieee1275/console.h>
+
+#define IEEE1275_IHANDLE_INVALID  ((grub_ieee1275_cell_t) 0)
+
+struct ofserial_hash_ent
+{
+  char *devpath;
+  /* Pointer to shortest available name on nodes representing canonical names,
+     otherwise NULL.  */
+  const char *shortest;
+  struct ofserial_hash_ent *next;
+};
+
+static void
+do_real_config (struct grub_serial_port *port)
+{
+  if (port->configured)
+    return;
+
+  if (grub_ieee1275_open (port->elem->devpath, &port->handle)
+      || port->handle == (grub_ieee1275_ihandle_t) -1)
+    port->handle = IEEE1275_IHANDLE_INVALID;
+
+  port->configured = 1;
+}
+
+/* Fetch a key.  */
+static int
+serial_hw_fetch (struct grub_serial_port *port)
+{
+  grub_ssize_t actual;
+  char c;
+
+  do_real_config (port);
+
+  if (port->handle == IEEE1275_IHANDLE_INVALID)
+    return -1;
+  grub_ieee1275_read (port->handle, &c, 1, &actual);
+
+  if (actual <= 0)
+    return -1;
+  return c;
+}
+
+/* Put a character.  */
+static void
+serial_hw_put (struct grub_serial_port *port, const int c)
+{
+  grub_ssize_t actual;
+  char c0 = c;
+
+  do_real_config (port);
+
+  if (port->handle == IEEE1275_IHANDLE_INVALID)
+    return;
+
+  grub_ieee1275_write (port->handle, &c0, 1, &actual);
+}
+
+/* Initialize a serial device. PORT is the port number for a serial device.
+   SPEED is a DTE-DTE speed which must be one of these: 2400, 4800, 9600,
+   19200, 38400, 57600 and 115200. WORD_LEN is the word length to be used
+   for the device. Likewise, PARITY is the type of the parity and
+   STOP_BIT_LEN is the length of the stop bit. The possible values for
+   WORD_LEN, PARITY and STOP_BIT_LEN are defined in the header file as
+   macros.  */
+static grub_err_t
+serial_hw_configure (struct grub_serial_port *port __attribute__ ((unused)),
+		     struct grub_serial_config *config __attribute__ ((unused)))
+{
+  /*  FIXME: no IEEE1275 serial config available.  */
+
+  return GRUB_ERR_NONE;
+}
+
+struct grub_serial_driver grub_ofserial_driver =
+  {
+    .configure = serial_hw_configure,
+    .fetch = serial_hw_fetch,
+    .put = serial_hw_put
+  };
+
+#define OFSERIAL_HASH_SZ	8
+static struct ofserial_hash_ent *ofserial_hash[OFSERIAL_HASH_SZ];
+
+static int
+ofserial_hash_fn (const char *devpath)
+{
+  int hash = 0;
+  while (*devpath)
+    hash ^= *devpath++;
+  return (hash & (OFSERIAL_HASH_SZ - 1));
+}
+
+static struct ofserial_hash_ent *
+ofserial_hash_find (const char *devpath)
+{
+  struct ofserial_hash_ent *p = ofserial_hash[ofserial_hash_fn(devpath)];
+
+  while (p)
+    {
+      if (!grub_strcmp (p->devpath, devpath))
+	break;
+      p = p->next;
+    }
+  return p;
+}
+
+static struct ofserial_hash_ent *
+ofserial_hash_add_real (char *devpath)
+{
+  struct ofserial_hash_ent *p;
+  struct ofserial_hash_ent **head = &ofserial_hash[ofserial_hash_fn(devpath)];
+
+  p = grub_malloc(sizeof (*p));
+  if (!p)
+    return NULL;
+
+  p->devpath = devpath;
+  p->next = *head;
+  p->shortest = 0;
+  *head = p;
+  return p;
+}
+
+static struct ofserial_hash_ent *
+ofserial_hash_add (char *devpath, char *curcan)
+{
+  struct ofserial_hash_ent *p, *pcan;
+
+  p = ofserial_hash_add_real (devpath);
+
+  grub_dprintf ("serial", "devpath = %s, canonical = %s\n", devpath, curcan);
+
+  if (!curcan)
+    {
+      p->shortest = devpath;
+      return p;
+    }
+
+  pcan = ofserial_hash_find (curcan);
+  if (!pcan)
+    pcan = ofserial_hash_add_real (curcan);
+  else
+    grub_free (curcan);
+
+  if (!pcan)
+    grub_errno = GRUB_ERR_NONE;
+  else
+    {
+      if (!pcan->shortest
+	  || grub_strlen (pcan->shortest) > grub_strlen (devpath))
+	pcan->shortest = devpath;
+    }
+
+  return p;
+}
+
+static void
+dev_iterate_real (struct grub_ieee1275_devalias *alias,
+		  int use_name)
+{
+  struct ofserial_hash_ent *op;
+
+  if (grub_strcmp (alias->type, "serial") != 0)
+    return;
+
+  grub_dprintf ("serial", "serial name = %s, path = %s\n", alias->name,
+		alias->path);
+
+  op = ofserial_hash_find (alias->path);
+  if (!op)
+    {
+      char *name = grub_strdup (use_name ? alias->name : alias->path);
+      char *can = grub_strdup (alias->path);
+      if (!name || !can)
+	{
+	  grub_errno = GRUB_ERR_NONE;
+	  grub_free (name);
+	  grub_free (can);
+	  return;
+	}
+      op = ofserial_hash_add (name, can);
+    }
+  return;
+}
+
+static int
+dev_iterate (struct grub_ieee1275_devalias *alias)
+{
+  dev_iterate_real (alias, 0);
+  return 0;
+}
+
+static const char *
+add_port (struct ofserial_hash_ent *ent)
+{
+  struct grub_serial_port *port;
+  char *ptr;
+  grub_err_t err;
+
+  if (!ent->shortest)
+    return NULL;
+
+  port = grub_zalloc (sizeof (*port));
+  if (!port)
+    return NULL;
+  port->name = grub_malloc (sizeof ("ieee1275/")
+			    + grub_strlen (ent->shortest));
+  port->elem = ent;
+  if (!port->name)
+    return NULL;
+  ptr = grub_stpcpy (port->name, "ieee1275/");
+  grub_strcpy (ptr, ent->shortest);
+
+  port->driver = &grub_ofserial_driver;
+  err = grub_serial_config_defaults (port);
+  if (err)
+    grub_print_error ();
+
+  grub_serial_register (port);
+
+  return port->name;
+}
+
+const char *
+grub_ofserial_add_port (const char *path)
+{
+  struct ofserial_hash_ent *ent;
+  char *name = grub_strdup (path);
+  char *can = grub_strdup (path);
+
+  if (!name || ! can)
+    {
+      grub_free (name);
+      grub_free (can);
+      return NULL;
+    }
+
+  ent = ofserial_hash_add (name, can);
+  return add_port (ent);
+}
+
+void
+grub_ofserial_init (void)
+{
+  unsigned i;
+  struct grub_ieee1275_devalias alias;
+
+  FOR_IEEE1275_DEVALIASES(alias)
+    dev_iterate_real (&alias, 1);
+
+  grub_ieee1275_devices_iterate (dev_iterate);
+  
+  for (i = 0; i < ARRAY_SIZE (ofserial_hash); i++)
+    {
+      struct ofserial_hash_ent *ent;
+      for (ent = ofserial_hash[i]; ent; ent = ent->next)
+	add_port (ent);
+    }
+}
+