dev: bring some of the core devices we need in line with uint_fast8_t

We can defer a lot because only 8080/8085 at this point have it differing
from uint8_t

diff --git a/Kernel/dev/blkdev.c b/Kernel/dev/blkdev.c
index d78463d..783a359 100644 (file)
--- a/Kernel/dev/blkdev.c
+++ b/Kernel/dev/blkdev.c
@@ -53,9 +53,9 @@
 static blkdev_t blkdev_table[MAX_BLKDEV];
 struct blkparam blk_op;
 
-int blkdev_open(uint8_t minor, uint16_t flags)
+int blkdev_open(uint_fast8_t minor, uint16_t flags)
 {
-    uint8_t drive, partition;
+    uint_fast8_t drive, partition;
 
     used(flags);
 
@@ -72,9 +72,9 @@ int blkdev_open(uint8_t minor, uint16_t flags)
     return -1;
 }
 
-static int blkdev_transfer(uint8_t minor, uint8_t rawflag)
+static int blkdev_transfer(uint_fast8_t minor, uint_fast8_t rawflag)
 {
-    uint8_t partition, n;
+    uint_fast8_t partition, n;
     uint16_t count = 0;
 
     /* we trust that blkdev_open() has already verified that this minor number is valid */
@@ -109,7 +109,7 @@ static int blkdev_transfer(uint8_t minor, uint8_t rawflag)
        /* partition 0 is the whole disk and requires no translation */
        if(blk_op.lba >= blk_op.blkdev->drive_lba_count)
            goto xferfail;
-    }else{
+    } else {
        /* partitions 1+ require us to add in an offset */
        if(blk_op.lba >= blk_op.blkdev->lba_count[partition-1])
            goto xferfail;
@@ -133,21 +133,21 @@ xferfail:
     return -1;
 }
 
-int blkdev_read(uint8_t minor, uint8_t rawflag, uint8_t flag)
+int blkdev_read(uint_fast8_t minor, uint_fast8_t rawflag, uint_fast8_t flag)
 {
     used(flag); /* not used */
     blk_op.is_read = true;
     return blkdev_transfer(minor, rawflag);
 }
 
-int blkdev_write(uint8_t minor, uint8_t rawflag, uint8_t flag)
+int blkdev_write(uint_fast8_t minor, uint_fast8_t rawflag, uint_fast8_t flag)
 {
     used(flag); /* not used */
     blk_op.is_read = false;
     return blkdev_transfer(minor, rawflag);
 }
 
-int blkdev_ioctl(uint8_t minor, uarg_t request, char *data)
+int blkdev_ioctl(uint_fast8_t minor, uarg_t request, char *data)
 {
     used(data); /* unused */
 
@@ -181,9 +181,9 @@ blkdev_t *blkdev_alloc(void)
 }
 
 /* Flags is not used yet but will be needed (eg for swap scans) */
-void blkdev_scan(blkdev_t *blk, uint8_t flags)
+void blkdev_scan(blkdev_t *blk, uint_fast8_t flags)
 {
-    uint8_t letter = 'a' + (blk - blkdev_table);
+    uint_fast8_t letter = 'a' + (blk - blkdev_table);
 
     used(flags); /* not used */
 

diff --git a/Kernel/dev/blkdev.h b/Kernel/dev/blkdev.h
index 89c6320..d41ec87 100644 (file)
--- a/Kernel/dev/blkdev.h
+++ b/Kernel/dev/blkdev.h
@@ -3,7 +3,7 @@
 
 /* block device drives should call blkdev_add() for each block device found,
    and implement a sector transfer function matching the following prototype. */
-typedef uint8_t (*transfer_function_t)(void);
+typedef uint_fast8_t (*transfer_function_t)(void);
 typedef int (*flush_function_t)(void);
 
 /* the following details should be required only by partition parsing code */
@@ -43,11 +43,11 @@ extern struct blkparam blk_op;
 
 /* public interface */
 extern blkdev_t *blkdev_alloc(void);
-extern void blkdev_scan(blkdev_t *blk, uint8_t flags);
+extern void blkdev_scan(blkdev_t *blk, uint_fast8_t flags);
 #define SWAPSCAN    0x01
-extern int blkdev_open(uint8_t minor, uint16_t flags);
-extern int blkdev_read(uint8_t minor, uint8_t rawflag, uint8_t flag);
-extern int blkdev_write(uint8_t minor, uint8_t rawflag, uint8_t flag);
-extern int blkdev_ioctl(uint8_t minor, uarg_t request, char *data);
+extern int blkdev_open(uint_fast8_t minor, uint16_t flags);
+extern int blkdev_read(uint_fast8_t minor, uint_fast8_t rawflag, uint_fast8_t flag);
+extern int blkdev_write(uint_fast8_t minor, uint_fast8_t rawflag, uint_fast8_t flag);
+extern int blkdev_ioctl(uint_fast8_t minor, uarg_t request, char *data);
 
 #endif

diff --git a/Kernel/dev/devfdc765.c b/Kernel/dev/devfdc765.c
index ef0bb05..c9e8263 100644 (file)
--- a/Kernel/dev/devfdc765.c
+++ b/Kernel/dev/devfdc765.c
@@ -17,7 +17,7 @@ static timer_t spindown_timer, recal_timer;
 static uint8_t lastdrive;
 static uint8_t trackpos[4] = { 0xFF, 0xFF, 0xFF, 0xFF };
 
-int devfd_open(uint8_t minor, uint16_t flag)
+int devfd_open(uint_fast8_t minor, uint16_t flag)
 {
     flag;
     if(minor >= FDC765_MAX_FLOPPY) {
@@ -51,7 +51,7 @@ void devfd_spindown(void)
 }
 
 /* Seek to track 0. */
-static uint8_t fd_recalibrate(void)
+static uint_fast8_t fd_recalibrate(void)
 {
     /*
      * Keep trying to recalibrate until the command succeed or a
@@ -77,19 +77,19 @@ static uint8_t fd_recalibrate(void)
 /* Set up the controller for a given block, seek, and wait for it.
    By the time we are called the motor is assumed to be at speed */
 
-static uint8_t fd_seek(uint16_t lba)
+static uint_fast8_t fd_seek(uint16_t lba)
 {
-    uint8_t i = 0;
+    uint_fast8_t i = 0;
     /* Hack for the moment until we introduce the proper floppy ioctls
        here and in the platform code */
 #ifdef CONFIG_FDC765_DS
-    uint8_t track2 = lba / 9;
-    uint8_t newtrack = track2 >> 1;
+    uint_fast8_t track2 = lba / 9;
+    uint_fast8_t newtrack = track2 >> 1;
 
     fd765_sector = (lba % 9) + 1;
     fd765_head = track2 & 1;
 #else
-    uint8_t newtrack = lba / 9;
+    uint_fast8_t newtrack = lba / 9;
     fd765_sector = (lba % 9) + 1;
     fd765_head = 0;
 #endif
@@ -123,7 +123,7 @@ static void fd_select(int minor)
     nudge_timer();
 }
 
-static int devfd_transfer(uint8_t minor, bool is_read, uint8_t is_raw)
+static int devfd_transfer(uint_fast8_t minor, bool is_read, uint_fast8_t is_raw)
 {
     int ct = 0;
     int tries;
@@ -194,13 +194,13 @@ static int devfd_transfer(uint8_t minor, bool is_read, uint8_t is_raw)
     return ct << BLKSHIFT;
 }
 
-int devfd_read(uint8_t minor, uint8_t is_raw, uint8_t flag)
+int devfd_read(uint_fast8_t minor, uint_fast8_t is_raw, uint_fast8_t flag)
 {
     flag;minor;
     return devfd_transfer(minor, true, is_raw);
 }
 
-int devfd_write(uint8_t minor, uint8_t is_raw, uint8_t flag)
+int devfd_write(uint_fast8_t minor, uint_fast8_t is_raw, uint_fast8_t flag)
 {
     flag;minor;
     return devfd_transfer(minor, false, is_raw);

diff --git a/Kernel/dev/devfdc765.h b/Kernel/dev/devfdc765.h
index cf5afcf..705a632 100644 (file)
--- a/Kernel/dev/devfdc765.h
+++ b/Kernel/dev/devfdc765.h
@@ -2,9 +2,9 @@
 #define __DEVFDC765_DOT_H__
 
 /* public interface */
-int devfd_open(uint8_t minor, uint16_t flag);
-int devfd_read(uint8_t minor, uint8_t rawflag, uint8_t flag);
-int devfd_write(uint8_t minor, uint8_t rawflag, uint8_t flag);
+int devfd_open(uint_fast8_t minor, uint16_t flag);
+int devfd_read(uint_fast8_t minor, uint_fast8_t rawflag, uint_fast8_t flag);
+int devfd_write(uint_fast8_t minor, uint_fast8_t rawflag, uint_fast8_t flag);
 
 extern void devfd_spindown(void);
 

diff --git a/Kernel/dev/devsd.c b/Kernel/dev/devsd.c
index 46cfcef..7b62c48 100644 (file)
--- a/Kernel/dev/devsd.c
+++ b/Kernel/dev/devsd.c
@@ -22,9 +22,9 @@
 
 /* for platforms with multiple SD card slots, this variable contains
  * the current operation's drive number */
-uint8_t sd_drive;
+uint_fast8_t sd_drive;
 
-uint8_t devsd_transfer_sector(void)
+uint_fast8_t devsd_transfer_sector(void)
 {
     uint8_t attempt;
     bool success;
@@ -74,7 +74,7 @@ void sd_spi_release(void)
 uint8_t sd_spi_wait(bool want_ff)
 {
     unsigned int timer;
-    unsigned char b;
+    uint_fast8_t b;
 
     timer = set_timer_ms(500);
 
@@ -96,9 +96,10 @@ uint8_t sd_spi_wait(bool want_ff)
     return b;
 }
 
-int sd_send_command(unsigned char cmd, uint32_t arg)
+int sd_send_command(uint_fast8_t, uint32_t arg)
 {
-    unsigned char n, res, *p;
+    unsigned char *p;
+    uint_fast8_t n, res;
 
     if (cmd & 0x80) {   /* ACMD<n> is the command sequense of CMD55-CMD<n> */
         cmd &= 0x7F;

diff --git a/Kernel/dev/devsd.h b/Kernel/dev/devsd.h
index 4d691a5..d0bc4ed 100644 (file)
--- a/Kernel/dev/devsd.h
+++ b/Kernel/dev/devsd.h
@@ -42,21 +42,21 @@ void devsd_init(void);
 void sd_spi_clock(bool go_fast) SD_SPI_CALLTYPE;
 void sd_spi_raise_cs(void);
 void sd_spi_lower_cs(void);
-void sd_spi_transmit_byte(uint8_t byte) SD_SPI_CALLTYPE;
+void sd_spi_transmit_byte(uint_fast8_t byte) SD_SPI_CALLTYPE;
 uint8_t sd_spi_receive_byte(void);
 
 bool sd_spi_receive_sector(void);
 bool sd_spi_transmit_sector(void);
 
 /* for platforms which support multiple SD cards */
-extern uint8_t sd_drive; /* current card/drive number */
+extern uint_fast8_t sd_drive; /* current card/drive number */
 
 #ifdef _SD_PRIVATE
 
 /* internal functions */
 void sd_spi_release(void);
-int sd_send_command(unsigned char cmd, uint32_t arg);
-uint8_t sd_spi_wait(bool want_ff);
+int sd_send_command(uint_fast8_t cmd, uint32_t arg);
+uint_fast8_t sd_spi_wait(bool want_ff);
 void sd_init_drive(void);
 int sd_spi_init(void);
 uint8_t devsd_transfer_sector(void);

diff --git a/Kernel/dev/devsd_discard.c b/Kernel/dev/devsd_discard.c
index b77fc2c..abe0e28 100644 (file)
--- a/Kernel/dev/devsd_discard.c
+++ b/Kernel/dev/devsd_discard.c
@@ -36,7 +36,7 @@ void sd_init_drive(void)
 {
     blkdev_t *blk;
     unsigned char csd[16], n;
-    uint8_t card_type;
+    uint_fast8_t card_type;
 
     kprintf("SD drive %d: ", sd_drive);
     card_type = sd_spi_init();
@@ -76,7 +76,8 @@ void sd_init_drive(void)
 
 int sd_spi_init(void)
 {
-    unsigned char n, cmd, card_type, ocr[4];
+    uint_fast8_t n, cmd, card_type;
+    unsigned char ocr[4];
     timer_t timer;
 
        /* Initialising SD cards is pretty horrible; they aren't sane SPI devices.