[2545] 2009-08-29 Robert Millan <address@hidden>

[Robert Millan]

Revision: 2545
          http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=2545
Author:   robertmh
Date:     2009-08-29 00:24:32 +0000 (Sat, 29 Aug 2009)
Log Message:
-----------
2009-08-29  Robert Millan  <address@hidden>

        * term/i386/pc/serial.c: Include `<grub/machine/memory.h>'.

        [GRUB_MACHINE_PCBIOS] (serial_hw_io_addr): Macroify initialization
        value (0x0400 -> GRUB_MEMORY_MACHINE_BIOS_DATA_AREA_ADDR).

        [! GRUB_MACHINE_PCBIOS] (GRUB_SERIAL_PORT_NUM): Calculate using
        `ARRAY_SIZE' macro.

Modified Paths:
--------------
    trunk/grub2/ChangeLog
    trunk/grub2/term/i386/pc/serial.c

Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog       2009-08-28 16:29:34 UTC (rev 2544)
+++ trunk/grub2/ChangeLog       2009-08-29 00:24:32 UTC (rev 2545)
@@ -1,3 +1,13 @@
+2009-08-29  Robert Millan  <address@hidden>
+
+       * term/i386/pc/serial.c: Include `<grub/machine/memory.h>'.
+
+       [GRUB_MACHINE_PCBIOS] (serial_hw_io_addr): Macroify initialization
+       value (0x0400 -> GRUB_MEMORY_MACHINE_BIOS_DATA_AREA_ADDR).
+
+       [! GRUB_MACHINE_PCBIOS] (GRUB_SERIAL_PORT_NUM): Calculate using
+       `ARRAY_SIZE' macro.
+
 2009-08-28  Vladimir Serbinenko  <address@hidden>
 
        * kern/file.c (grub_file_read): Check offset.

Modified: trunk/grub2/term/i386/pc/serial.c
===================================================================
--- trunk/grub2/term/i386/pc/serial.c   2009-08-28 16:29:34 UTC (rev 2544)
+++ trunk/grub2/term/i386/pc/serial.c   2009-08-29 00:24:32 UTC (rev 2545)
@@ -1,6 +1,6 @@
 /*
  *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2000,2001,2002,2003,2004,2005,2007,2008  Free Software 
Foundation, Inc.
+ *  Copyright (C) 2000,2001,2002,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
@@ -17,6 +17,7 @@
  */
 
 #include <grub/machine/machine.h>
+#include <grub/machine/memory.h>
 #include <grub/machine/serial.h>
 #include <grub/machine/console.h>
 #include <grub/term.h>
@@ -64,12 +65,11 @@
 static struct serial_port serial_settings;
 
 #ifdef GRUB_MACHINE_PCBIOS
-/* The BIOS data area.  */
-static const unsigned short *serial_hw_io_addr = (const unsigned short *) 
0x0400;
+static const unsigned short *serial_hw_io_addr = (const unsigned short *) 
GRUB_MEMORY_MACHINE_BIOS_DATA_AREA_ADDR;
 #define GRUB_SERIAL_PORT_NUM 4
 #else
 static const unsigned short serial_hw_io_addr[] = { 0x3f8, 0x2f8, 0x3e8, 0x2e8 
};
-#define GRUB_SERIAL_PORT_NUM 
(sizeof(serial_hw_io_addr)/sizeof(serial_hw_io_addr[0]))
+#define GRUB_SERIAL_PORT_NUM (ARRAY_SIZE(serial_hw_io_addr))
 #endif
 
 /* Return the port number for the UNITth serial device.  */