[syslinux:disklib] libcom32 disk: A slight grunt of constipation

syslinux-bot for Shao Miller shao.miller at yrdsb.edu.on.ca
Sun Jul 25 17:33:11 PDT 2010


Commit-ID:  092b8884d54f6469dd401283d6fdc401a3481444
Gitweb:     http://syslinux.zytor.com/commit/092b8884d54f6469dd401283d6fdc401a3481444
Author:     Shao Miller <shao.miller at yrdsb.edu.on.ca>
AuthorDate: Mon, 28 Jun 2010 02:30:49 -0400
Committer:  Shao Miller <shao.miller at yrdsb.edu.on.ca>
CommitDate: Sat, 10 Jul 2010 01:03:05 -0400

libcom32 disk: A slight grunt of constipation

Add const qualifier because we can.

Signed-off-by: Shao Miller <shao.miller at yrdsb.edu.on.ca>


---
 com32/include/syslinux/disk.h |   12 ++++++------
 com32/lib/syslinux/disk.c     |   11 ++++++-----
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/com32/include/syslinux/disk.h b/com32/include/syslinux/disk.h
index 82513ce..e81bd3b 100644
--- a/com32/include/syslinux/disk.h
+++ b/com32/include/syslinux/disk.h
@@ -58,12 +58,12 @@ struct disk_ebios_dapa {
 };
 
 extern int disk_int13_retry(const com32sys_t * inreg, com32sys_t * outreg);
-extern int disk_get_params(int disk, struct disk_info *diskinfo);
-extern void *disk_read_sectors(struct disk_info *diskinfo, uint64_t lba,
-			       uint8_t count);
-extern int disk_write_sector(struct disk_info *diskinfo, unsigned int lba,
-			     const void *data);
-extern int disk_write_verify_sector(struct disk_info *diskinfo,
+extern int disk_get_params(int disk, struct disk_info *const diskinfo);
+extern void *disk_read_sectors(const struct disk_info *const diskinfo,
+			       uint64_t lba, uint8_t count);
+extern int disk_write_sector(const struct disk_info *const diskinfo,
+			     unsigned int lba, const void *data);
+extern int disk_write_verify_sector(const struct disk_info *const diskinfo,
 				    unsigned int lba, const void *buf);
 
 #endif /* _SYSLINUX_DISK_H */
diff --git a/com32/lib/syslinux/disk.c b/com32/lib/syslinux/disk.c
index 8223534..3b23fef 100644
--- a/com32/lib/syslinux/disk.c
+++ b/com32/lib/syslinux/disk.c
@@ -68,7 +68,7 @@ int disk_int13_retry(const com32sys_t * inreg, com32sys_t * outreg)
  * @v diskinfo			The structure to save the queried params to
  * @ret (int)			0 upon success, -1 upon failure
  */
-int disk_get_params(int disk, struct disk_info *diskinfo)
+int disk_get_params(int disk, struct disk_info *const diskinfo)
 {
     static com32sys_t getparm, parm, getebios, ebios;
 
@@ -121,7 +121,8 @@ int disk_get_params(int disk, struct disk_info *diskinfo)
  * Uses the disk number and information from diskinfo.  Read count sectors
  * from drive, starting at lba.  Return a new buffer, or NULL upon failure.
  */
-void *disk_read_sectors(struct disk_info *diskinfo, uint64_t lba, uint8_t count)
+void *disk_read_sectors(const struct disk_info *const diskinfo, uint64_t lba,
+			uint8_t count)
 {
     com32sys_t inreg;
     struct disk_ebios_dapa *dapa = __com32.cs_bounce;
@@ -197,7 +198,7 @@ void *disk_read_sectors(struct disk_info *diskinfo, uint64_t lba, uint8_t count)
  * Uses the disk number and information from diskinfo.
  * Write a sector to a disk drive, starting at lba.
  */
-int disk_write_sector(struct disk_info *diskinfo, unsigned int lba,
+int disk_write_sector(const struct disk_info *const diskinfo, unsigned int lba,
 		      const void *data)
 {
     com32sys_t inreg;
@@ -267,8 +268,8 @@ int disk_write_sector(struct disk_info *diskinfo, unsigned int lba,
  * Writes a sector to a disk drive starting at lba, then reads it back
  * to verify it was written correctly.
  */
-int disk_write_verify_sector(struct disk_info *diskinfo, unsigned int lba,
-			     const void *buf)
+int disk_write_verify_sector(const struct disk_info *const diskinfo,
+			     unsigned int lba, const void *buf)
 {
     char *rb;
     int rv;



More information about the Syslinux-commits mailing list