ieee1275: Consolidate repeated definitions of IEEE1275_IHANDLE_INVALID

Consolidate repeated definitions of IEEE1275_IHANDLE_INVALID that are cast
to the type grub_ieee1275_ihandle_t. On the occasion add "GRUB_" prefix to
the constant name.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>

diff --git a/grub-core/commands/ieee1275/ibmvtpm.c b/grub-core/commands/ieee1275/ibmvtpm.c
index a6fee5c516dcdfb107b0979f36459fd7c77cc573..dd30c7432fcd4744e650b7a04f2a04542046c9d9 100644 (file)
--- a/grub-core/commands/ieee1275/ibmvtpm.c
+++ b/grub-core/commands/ieee1275/ibmvtpm.c
@@ -29,8 +29,6 @@
 static grub_ieee1275_ihandle_t tpm_ihandle;
 static grub_uint8_t tpm_version;
 
-#define IEEE1275_IHANDLE_INVALID ((grub_ieee1275_ihandle_t) 0)
-
 static void
 tpm_get_tpm_version (void)
 {
@@ -53,7 +51,7 @@ tpm_init (void)
     {
       if (grub_ieee1275_open ("/vdevice/vtpm", &tpm_ihandle) < 0)
        {
-         tpm_ihandle = IEEE1275_IHANDLE_INVALID;
+         tpm_ihandle = GRUB_IEEE1275_IHANDLE_INVALID;
          return GRUB_ERR_UNKNOWN_DEVICE;
        }
 

diff --git a/grub-core/term/ieee1275/serial.c b/grub-core/term/ieee1275/serial.c
index 9bc44b306349681003c282c10e9787066ff06986..ac2a8f8279d343146797d32c6265b5165693c99f 100644 (file)
--- a/grub-core/term/ieee1275/serial.c
+++ b/grub-core/term/ieee1275/serial.c
@@ -25,8 +25,6 @@
 #include <grub/i18n.h>
 #include <grub/ieee1275/console.h>
 
-#define IEEE1275_IHANDLE_INVALID  ((grub_ieee1275_ihandle_t) 0)
-
 struct ofserial_hash_ent
 {
   char *devpath;
@@ -44,7 +42,7 @@ do_real_config (struct grub_serial_port *port)
 
   if (grub_ieee1275_open (port->elem->devpath, &port->handle)
       || port->handle == (grub_ieee1275_ihandle_t) -1)
-    port->handle = IEEE1275_IHANDLE_INVALID;
+    port->handle = GRUB_IEEE1275_IHANDLE_INVALID;
 
   port->configured = 1;
 }
@@ -58,7 +56,7 @@ serial_hw_fetch (struct grub_serial_port *port)
 
   do_real_config (port);
 
-  if (port->handle == IEEE1275_IHANDLE_INVALID)
+  if (port->handle == GRUB_IEEE1275_IHANDLE_INVALID)
     return -1;
   grub_ieee1275_read (port->handle, &c, 1, &actual);
 
@@ -76,7 +74,7 @@ serial_hw_put (struct grub_serial_port *port, const int c)
 
   do_real_config (port);
 
-  if (port->handle == IEEE1275_IHANDLE_INVALID)
+  if (port->handle == GRUB_IEEE1275_IHANDLE_INVALID)
     return;
 
   grub_ieee1275_write (port->handle, &c0, 1, &actual);

diff --git a/include/grub/ieee1275/ieee1275.h b/include/grub/ieee1275/ieee1275.h
index dddb385149e047193f74ffe35236d51705d6a9db..c445d0499ef16b70064ec52ae20bfde8c0c35849 100644 (file)
--- a/include/grub/ieee1275/ieee1275.h
+++ b/include/grub/ieee1275/ieee1275.h
@@ -60,6 +60,7 @@ struct grub_ieee1275_common_hdr
 typedef grub_uint32_t grub_ieee1275_ihandle_t;
 typedef grub_uint32_t grub_ieee1275_phandle_t;
 
+#define GRUB_IEEE1275_IHANDLE_INVALID  ((grub_ieee1275_ihandle_t) 0)
 #define GRUB_IEEE1275_PHANDLE_INVALID  ((grub_ieee1275_phandle_t) -1)
 
 struct grub_ieee1275_devalias