coco2cart: align with type changes

diff --git a/Kernel/platform-coco2cart/devlpr.c b/Kernel/platform-coco2cart/devlpr.c
index 9ddfae4..4f4b3a9 100644 (file)
--- a/Kernel/platform-coco2cart/devlpr.c
+++ b/Kernel/platform-coco2cart/devlpr.c
@@ -8,7 +8,7 @@ volatile uint8_t * const pia0b = (uint8_t *)0xFF02;
 volatile uint8_t * const pia1a = (uint8_t *)0xFF20;
 volatile uint8_t * const pia1b = (uint8_t *)0xFF22;
 
-int lpr_open(uint8_t minor, uint16_t flag)
+int lpr_open(uint_fast8_t minor, uint16_t flag)
 {
        if (minor < 2)
                return 0;
@@ -16,7 +16,7 @@ int lpr_open(uint8_t minor, uint16_t flag)
        return -1;
 }
 
-int lpr_close(uint8_t minor)
+int lpr_close(uint_fast8_t minor)
 {
        if (minor == 1)
                dw_lpr_close();
@@ -37,7 +37,7 @@ static int iopoll(int sofar)
        return 0;
 }
 
-int lpr_write(uint8_t minor, uint8_t rawflag, uint8_t flag)
+int lpr_write(uint_fast8_t minor, uint_fast8_t rawflag, uint_fast8_t flag)
 {
        uint8_t *p = udata.u_base;
        uint8_t *pe = p + udata.u_count;

diff --git a/Kernel/platform-coco2cart/devtty.c b/Kernel/platform-coco2cart/devtty.c
index 466df67..8ff7a59 100644 (file)
--- a/Kernel/platform-coco2cart/devtty.c
+++ b/Kernel/platform-coco2cart/devtty.c
@@ -56,14 +56,14 @@ static uint8_t vmode;
 /* tty1 is the screen tty2 is the serial port */
 
 /* Output for the system console (kprintf etc) */
-void kputchar(char c)
+void kputchar(uint_fast8_t c)
 {
        if (c == '\n')
                tty_putc(1, '\r');
        tty_putc(1, c);
 }
 
-ttyready_t tty_writeready(uint8_t minor)
+ttyready_t tty_writeready(uint_fast8_t minor)
 {
        uint8_t c;
        if (minor == 1)
@@ -74,7 +74,7 @@ ttyready_t tty_writeready(uint8_t minor)
 
 /* For DragonPlus we should perhaps support both monitors 8) */
 
-void tty_putc(uint8_t minor, unsigned char c)
+void tty_putc(uint_fast8_t minor, uint_fast8_t c)
 {
        if (minor == 1) {
                if (vmode < 2)
@@ -83,12 +83,12 @@ void tty_putc(uint8_t minor, unsigned char c)
                *uart_data = c; /* Data */
 }
 
-void tty_sleeping(uint8_t minor)
+void tty_sleeping(uint_fast8_t minor)
 {
     used(minor);
 }
 
-void tty_data_consumed(uint8_t minor)
+void tty_data_consumed(uint_fast8_t minor)
 {
 }
 
@@ -116,7 +116,7 @@ static uint8_t bitbits[] = {
        0x00
 };
 
-void tty_setup(uint8_t minor, uint8_t flags)
+void tty_setup(uint_fast8_t minor, uint_fast8_t flags)
 {
        uint8_t r;
        if (minor != ACIA_TTY)
@@ -141,7 +141,7 @@ void tty_setup(uint8_t minor, uint8_t flags)
        }
 }
 
-int tty_carrier(uint8_t minor)
+int tty_carrier(uint_fast8_t minor)
 {
        /* The serial DCD is status bit 5 but not wired */
        return 1;
@@ -352,7 +352,7 @@ static struct fontinfo fontinfo = {
 #define pia1b  ((volatile uint8_t *)0xFF22)
 #define sam_v  ((volatile uint8_t *)0xFFC0)
 
-int gfx_ioctl(uint8_t minor, uarg_t arg, char *ptr)
+int gfx_ioctl(uint_fast8_t minor, uarg_t arg, char *ptr)
 {
        extern unsigned char fontdata_8x8[];
        uint16_t size = 96 * 8;

diff --git a/Kernel/platform-coco2cart/devtty.h b/Kernel/platform-coco2cart/devtty.h
index 2d6f873..cae2154 100644 (file)
--- a/Kernel/platform-coco2cart/devtty.h
+++ b/Kernel/platform-coco2cart/devtty.h
@@ -7,6 +7,6 @@ extern uint8_t keymap[8];
 extern uint8_t keyboard[8][7];
 extern uint8_t shiftkeyboard[8][7];
 
-extern int gfx_ioctl(uint8_t minor, uarg_t arg, char *ptr);
+extern int gfx_ioctl(uint_fast8_t minor, uarg_t arg, char *ptr);
 
 #endif

diff --git a/Kernel/platform-coco2cart/main.c b/Kernel/platform-coco2cart/main.c
index 2bba597..51ffa1f 100644 (file)
--- a/Kernel/platform-coco2cart/main.c
+++ b/Kernel/platform-coco2cart/main.c
@@ -18,7 +18,7 @@ void platform_idle(void)
 
 uint8_t platform_param(char *p)
 {
-    return 0;
+       return 0;
 }
 
 void do_beep(void)

diff --git a/Kernel/platform-coco2cart/mini_ide.c b/Kernel/platform-coco2cart/mini_ide.c
index e7c9ef1..3649826 100644 (file)
--- a/Kernel/platform-coco2cart/mini_ide.c
+++ b/Kernel/platform-coco2cart/mini_ide.c
@@ -25,7 +25,7 @@ extern void devide_write_data(uint8_t *p);
 extern uint8_t idepage;
 
 /* FIXME: switch to the correct mpi slot on entry */
-static int ide_transfer(uint8_t minor, bool is_read, uint8_t rawflag)
+static int ide_transfer(uint_fast8_t minor, bool is_read, uint_fast8_t rawflag)
 {
     uint16_t nb = 0;
     uint8_t *dptr;
@@ -68,7 +68,7 @@ static int ide_transfer(uint8_t minor, bool is_read, uint8_t rawflag)
 
 }
 
-int ide_open(uint8_t minor, uint16_t flag)
+int ide_open(uint_fast8_t minor, uint16_t flag)
 {
     if (!(ide_present & (1 << (minor >> 7)))) {
         udata.u_error = ENODEV;
@@ -77,17 +77,17 @@ int ide_open(uint8_t minor, uint16_t flag)
     return 0;
 }
 
-int ide_read(uint8_t minor, uint8_t rawflag, uint8_t flag)
+int ide_read(uint_fast8_t minor, uint_fast8_t rawflag, uint_fast8_t flag)
 {
     return ide_transfer(minor, true, rawflag);
 }
 
-int ide_write(uint8_t minor, uint8_t rawflag, uint8_t flag)
+int ide_write(uint_fast8_t minor, uint_fast8_t rawflag, uint_fast8_t flag)
 {
     return ide_transfer(minor, false, rawflag);
 }
 
-int ide_ioctl(uint8_t minor, uarg_t request, char *unused)
+int ide_ioctl(uint_fast8_t minor, uarg_t request, char *unused)
 {
     if (request != BLKFLSBUF)
         return -1;