2009-07-15 Pavel Roskin <proski@gnu.org>

	* include/grub/disk.h (struct grub_disk_dev): Use enum for id.
	* kern/disk.c (struct grub_disk_cache): Likewise.

diff --git a/ChangeLog b/ChangeLog
index 3f6ace35315f1216b0820ee2cd693493d87a7ccf..a1262157705f5afad6a68a1b9ca4f778992f3deb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2009-07-15  Pavel Roskin  <proski@gnu.org>
 
+       * include/grub/disk.h (struct grub_disk_dev): Use enum for id.
+       * kern/disk.c (struct grub_disk_cache): Likewise.
+
        * commands/probe.c (options): Typo fix.
 
        * include/grub/i386/pc/boot.h (GRUB_BOOT_MACHINE_BPB_END):

diff --git a/include/grub/disk.h b/include/grub/disk.h
index a47e113372b5e4cec43f01ced5c90067fe5798be..5899e9425bb8daf73c2614955cfcc997c84ca7e3 100644 (file)
--- a/include/grub/disk.h
+++ b/include/grub/disk.h
@@ -56,7 +56,7 @@ struct grub_disk_dev
   const char *name;
 
   /* The device id used by the cache manager.  */
-  unsigned long id;
+  enum grub_disk_dev_id id;
 
   /* Call HOOK with each device name, until HOOK returns non-zero.  */
   int (*iterate) (int (*hook) (const char *name));

diff --git a/kern/disk.c b/kern/disk.c
index 0c54ed4679f3e4dec2bd4b8729d76ea4697e0956..e167fb6304a47e94858e42577a32df5620852247 100644 (file)
--- a/kern/disk.c
+++ b/kern/disk.c
@@ -34,7 +34,7 @@ static grub_uint64_t grub_last_time = 0;
 /* Disk cache.  */
 struct grub_disk_cache
 {
-  unsigned long dev_id;
+  enum grub_disk_dev_id dev_id;
   unsigned long disk_id;
   grub_disk_addr_t sector;
   char *data;