From 4d6fe1c317f0a541922f4cf945365fd31e608e10 Mon Sep 17 00:00:00 2001 From: Jake Mannens Date: Wed, 18 Mar 2020 14:01:12 +1100 Subject: Added decimal and octal conversion specifiers ('%d' and '%o') to vsprintf(). Coverted all printk()/printf() functions to capatalised hex for readability. Tidied up some code. --- kernel/fd.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'kernel/fd.c') diff --git a/kernel/fd.c b/kernel/fd.c index f6563ea..d5e713a 100644 --- a/kernel/fd.c +++ b/kernel/fd.c @@ -194,7 +194,7 @@ static int sense_intr(struct sense_result *sr) { if(in < sizeof(struct sense_result)) return -1; - printk("[fd] Sense command success (Drive: %c:, CYL: 0x%02x, ST0: 0x%02x)\n", 'A' + (sr->st0 & 3), sr->cyl, sr->st0); + printk("[fd] Sense command success (Drive: %c:, CYL: 0x%02X, ST0: 0x%02X)\n", 'A' + (sr->st0 & 3), sr->cyl, sr->st0); return 0; } @@ -283,7 +283,7 @@ int fd_read_sect(int sect, struct req *r) { read_queue = r; } - printk("[fd] Reading sector 0x%01x (C: 0x%01x, H: 0x%01x, S: 0x%01x)\n", sect, cmd[2], cmd[3], cmd[4]); + printk("[fd] Reading sector 0x%01X (C: 0x%01X, H: 0x%01X, S: 0x%01X)\n", sect, cmd[2], cmd[3], cmd[4]); cli(); write_data(cmd, sizeof(cmd)); @@ -296,7 +296,7 @@ int fd_read_sect(int sect, struct req *r) { in = read_data(&res, sizeof(res)); if(in == sizeof(res) && !(res.st0 & 0xC0)) { - printk("[fd] Successfully read a sector (ST0: 0x%02x, N: 0x%02x)!\n", res.st0, res.n); + printk("[fd] Successfully read a sector (ST0: 0x%02X, N: 0x%02X)!\n", res.st0, res.n); printk(" DATA: %s\n", buffer); return 0; } -- cgit v1.3