From f651d13a18ba734b2fa9cf4164217c826f52bf23 Mon Sep 17 00:00:00 2001
From: phcoder <phcoder@debian.bg45.phnet>
Date: Sat, 10 Oct 2009 20:59:18 +0200
Subject: [PATCH] split serial

---
 conf/i386-coreboot.rmk              | 2 +-
 conf/i386-ieee1275.rmk              | 2 +-
 conf/i386-pc.rmk                    | 2 +-
 include/grub/i386/io.h              | 2 ++
 include/grub/{i386/pc => }/serial.h | 4 ++--
 term/{i386/pc => }/serial.c         | 8 ++++----
 6 files changed, 11 insertions(+), 9 deletions(-)
 rename include/grub/{i386/pc => }/serial.h (96%)
 rename term/{i386/pc => }/serial.c (98%)

diff --git a/conf/i386-coreboot.rmk b/conf/i386-coreboot.rmk
index 09ec7787c..59a9ed607 100644
--- a/conf/i386-coreboot.rmk
+++ b/conf/i386-coreboot.rmk
@@ -187,7 +187,7 @@ halt_mod_CFLAGS = $(COMMON_CFLAGS)
 halt_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
 # For serial.mod.
-serial_mod_SOURCES = term/i386/pc/serial.c
+serial_mod_SOURCES = term/serial.c
 serial_mod_CFLAGS = $(COMMON_CFLAGS)
 serial_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
diff --git a/conf/i386-ieee1275.rmk b/conf/i386-ieee1275.rmk
index 4b640de49..48c3ce9d9 100644
--- a/conf/i386-ieee1275.rmk
+++ b/conf/i386-ieee1275.rmk
@@ -156,7 +156,7 @@ halt_mod_CFLAGS = $(COMMON_CFLAGS)
 halt_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
 # For serial.mod.
-serial_mod_SOURCES = term/i386/pc/serial.c
+serial_mod_SOURCES = term/serial.c
 serial_mod_CFLAGS = $(COMMON_CFLAGS)
 serial_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
diff --git a/conf/i386-pc.rmk b/conf/i386-pc.rmk
index bf8fbfb9d..c4a4e7754 100644
--- a/conf/i386-pc.rmk
+++ b/conf/i386-pc.rmk
@@ -260,7 +260,7 @@ halt_mod_CFLAGS = $(COMMON_CFLAGS)
 halt_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
 # For serial.mod.
-serial_mod_SOURCES = term/i386/pc/serial.c
+serial_mod_SOURCES = term/serial.c
 serial_mod_CFLAGS = $(COMMON_CFLAGS)
 serial_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
diff --git a/include/grub/i386/io.h b/include/grub/i386/io.h
index 0e567766b..ae12a3e3d 100644
--- a/include/grub/i386/io.h
+++ b/include/grub/i386/io.h
@@ -21,6 +21,8 @@
 #ifndef	GRUB_IO_H
 #define	GRUB_IO_H	1
 
+typedef unsigned short int grub_port_t;
+
 static __inline unsigned char
 grub_inb (unsigned short int port)
 {
diff --git a/include/grub/i386/pc/serial.h b/include/grub/serial.h
similarity index 96%
rename from include/grub/i386/pc/serial.h
rename to include/grub/serial.h
index 0632ff79d..1c35b4093 100644
--- a/include/grub/i386/pc/serial.h
+++ b/include/grub/serial.h
@@ -17,8 +17,8 @@
  *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GRUB_SERIAL_MACHINE_HEADER
-#define GRUB_SERIAL_MACHINE_HEADER	1
+#ifndef GRUB_SERIAL_HEADER
+#define GRUB_SERIAL_HEADER	1
 
 /* Macros.  */
 
diff --git a/term/i386/pc/serial.c b/term/serial.c
similarity index 98%
rename from term/i386/pc/serial.c
rename to term/serial.c
index 1d74dbbc8..eac43bf1b 100644
--- a/term/i386/pc/serial.c
+++ b/term/serial.c
@@ -54,7 +54,7 @@ static const struct grub_arg_option options[] =
 /* Serial port settings.  */
 struct serial_port
 {
-  unsigned short port;
+  grub_port_t port;
   unsigned short divisor;
   unsigned short word_len;
   unsigned int   parity;
@@ -68,12 +68,12 @@ static struct serial_port serial_settings;
 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 };
+static const grub_port_t serial_hw_io_addr[] = { 0x3f8, 0x2f8, 0x3e8, 0x2e8 };
 #define GRUB_SERIAL_PORT_NUM (ARRAY_SIZE(serial_hw_io_addr))
 #endif
 
 /* Return the port number for the UNITth serial device.  */
-static inline unsigned short
+static inline grub_port_t
 serial_hw_get_port (const unsigned int unit)
 {
   if (unit < GRUB_SERIAL_PORT_NUM)
@@ -503,7 +503,7 @@ grub_cmd_serial (grub_extcmd_t cmd,
     }
 
   if (state[1].set)
-    serial_settings.port = (unsigned short) grub_strtoul (state[1].arg, 0, 0);
+    serial_settings.port = (grub_port_t) grub_strtoul (state[1].arg, 0, 0);
 
   if (state[2].set)
     {