X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdevices%2Fdisk.h;h=539c4b0bafdd8c589125e30d05266c4ded065210;hb=8f7c2027a5ad53ab7875eeb1d12057b0ed8ccb20;hp=9d5216418e02128cf62ecd45a1d210a1cd1c9ece;hpb=aa9a8ed3132ec405c8362b3fddf3868871fb7993;p=pintos-anon

diff --git a/src/devices/disk.h b/src/devices/disk.h
index 9d52164..539c4b0 100644
--- a/src/devices/disk.h
+++ b/src/devices/disk.h
@@ -1,18 +1,24 @@
-#ifndef HEADER_DISK_H
-#define HEADER_DISK_H 1
+#ifndef DEVICES_DISK_H
+#define DEVICES_DISK_H
 
 #include <inttypes.h>
 #include <stdint.h>
 
+/* Size of a disk sector in bytes. */
 #define DISK_SECTOR_SIZE 512
 
-typedef uint32_t disk_sector_no;
-#define PRDSNu PRIu32   /* For use with printk(). */
+/* Index of a disk sector within a disk.
+   Good enough for disks up to 2 TB. */
+typedef uint32_t disk_sector_t;
+
+/* Format specifier for printf(), e.g.:
+   printf ("sector=%"PRDSNu"\n", sector); */
+#define PRDSNu PRIu32
 
 void disk_init (void);
 struct disk *disk_get (int chan_no, int dev_no);
-disk_sector_no disk_size (struct disk *);
-void disk_read (struct disk *, disk_sector_no, void *);
-void disk_write (struct disk *, disk_sector_no, const void *);
+disk_sector_t disk_size (struct disk *);
+void disk_read (struct disk *, disk_sector_t, void *);
+void disk_write (struct disk *, disk_sector_t, const void *);
 
-#endif /* disk.h */
+#endif /* devices/disk.h */