more type alignments

None of these really matter as uint8_t == uint_fast8_t for Z80 but it's good
to get it and the signed/unsigned clashes tidied up.

diff --git a/Kernel/platform-sam/devatom.c b/Kernel/platform-sam/devatom.c
index 656c576..27bf4a8 100644 (file)
--- a/Kernel/platform-sam/devatom.c
+++ b/Kernel/platform-sam/devatom.c
@@ -9,7 +9,7 @@ __sfr __at 0xF7 ide_low;
 
 uint8_t atom_type;
 
-uint8_t devide_readb(uint8_t reg)
+uint_fast8_t devide_readb(uint_fast8_t reg)
 {
     volatile uint8_t dummy;
     ide_addr = reg;
@@ -17,7 +17,7 @@ uint8_t devide_readb(uint8_t reg)
     return ide_low;
 }
 
-void devide_writeb(uint8_t reg, uint8_t value)
+void devide_writeb(uint_fast8_t reg, uint_fast8_t value)
 {
     ide_addr = reg;
     ide_high = 0;

diff --git a/Kernel/platform-sam/devfd.c b/Kernel/platform-sam/devfd.c
index 77503e1..94eb0a6 100644 (file)
--- a/Kernel/platform-sam/devfd.c
+++ b/Kernel/platform-sam/devfd.c
@@ -23,7 +23,7 @@ static uint8_t fd_tab[MAX_FD] = { 0xFF, 0xFF, 0xFF, 0xFF };
 
 static uint8_t selmap[4] = { 0x01, 0x02, 0x04, 0x08 };
 
-static int fd_transfer(uint8_t minor, bool is_read, uint8_t rawflag)
+static int fd_transfer(uint_fast8_t minor, bool is_read, uint_fast8_t rawflag)
 {
     int ct = 0;
     int tries;
@@ -78,7 +78,7 @@ bad2:
     return -1;
 }
 
-int fd_open(uint8_t minor, uint16_t flag)
+int fd_open(uint_fast8_t minor, uint16_t flag)
 {
     flag;
     if(minor >= MAX_FD) {
@@ -88,13 +88,13 @@ int fd_open(uint8_t minor, uint16_t flag)
     return 0;
 }
 
-int fd_read(uint8_t minor, uint8_t rawflag, uint8_t flag)
+int fd_read(uint_fast8_t minor, uint_fast8_t rawflag, uint_fast8_t flag)
 {
     flag;
     return fd_transfer(minor, true, rawflag);
 }
 
-int fd_write(uint8_t minor, uint8_t rawflag, uint8_t flag)
+int fd_write(uint_fast8_t minor, uint_fast8_t rawflag, uint_fast8_t flag)
 {
     flag;rawflag;minor;
 //    return 0;

diff --git a/Kernel/platform-sam/devfd.h b/Kernel/platform-sam/devfd.h
index 5f94507..0b63bd7 100644 (file)
--- a/Kernel/platform-sam/devfd.h
+++ b/Kernel/platform-sam/devfd.h
@@ -2,9 +2,9 @@
 #define __DEVFD_DOT_H__
 
 /* public interface */
-int fd_read(uint8_t minor, uint8_t rawflag, uint8_t flag);
-int fd_write(uint8_t minor, uint8_t rawflag, uint8_t flag);
-int fd_open(uint8_t minor, uint16_t flag);
+int fd_read(uint_fast8_t minor, uint_fast8_t rawflag, uint_fast8_t flag);
+int fd_write(uint_fast8_t minor, uint_fast8_t rawflag, uint_fast8_t flag);
+int fd_open(uint_fast8_t minor, uint16_t flag);
 
 /* low level interface */
 uint16_t fd_reset(uint8_t *driveptr);

diff --git a/Kernel/platform-sam/devinput.c b/Kernel/platform-sam/devinput.c
index e06d30c..ad69b16 100644 (file)
--- a/Kernel/platform-sam/devinput.c
+++ b/Kernel/platform-sam/devinput.c
@@ -9,14 +9,14 @@ static int16_t mousedx, mousedy;
 static uint8_t mousebuttons;
 static uint8_t mousemod;
 
-static char buf[32];
+static uint_fast8_t buf[32];
 
 static struct s_queue kqueue = {
     buf, buf, buf, sizeof(buf), 0, sizeof(buf) / 2
 };
 
 /* Queue a character to the input device */
-void queue_input(uint8_t c)
+void queue_input(uint_fast8_t c)
 {
     insq(&kqueue, c);
     wakeup(&kqueue);
@@ -61,7 +61,7 @@ void platform_input_wait(void)
     psleep(&kqueue);
 }
 
-int platform_input_write(uint8_t flag)
+int platform_input_write(uint_fast8_t flag)
 {
     flag;
     udata.u_error = EINVAL;

diff --git a/Kernel/platform-sam/devlpr.c b/Kernel/platform-sam/devlpr.c
index 0eb4cdb..9ace6e3 100644 (file)
--- a/Kernel/platform-sam/devlpr.c
+++ b/Kernel/platform-sam/devlpr.c
@@ -16,7 +16,7 @@ __sfr __at 233 lpstrobe;
 __sfr __at 233 lpbusy;
 __sfr __at 234 lpmode;
 
-int lpr_open(uint8_t minor, uint16_t flag)
+int lpr_open(uint_fast8_t minor, uint16_t flag)
 {
        used(flag);
 
@@ -28,7 +28,7 @@ int lpr_open(uint8_t minor, uint16_t flag)
        return 0;
 }
 
-int lpr_close(uint8_t minor)
+int lpr_close(uint_fast8_t minor)
 {
        used(minor);
        return 0;
@@ -55,7 +55,7 @@ static uint8_t iopoll(void)
 }
 
 
-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)
 {
        minor;
        rawflag;

diff --git a/Kernel/platform-sam/devlpr.h b/Kernel/platform-sam/devlpr.h
index 7765c18..61e8c1f 100644 (file)
--- a/Kernel/platform-sam/devlpr.h
+++ b/Kernel/platform-sam/devlpr.h
@@ -1,8 +1,8 @@
 #ifndef __DEVLPR_DOT_H__
 #define __DEVLPR_DOT_H__
 
-int lpr_open(uint8_t minor, uint16_t flag);
-int lpr_close(uint8_t minor);
-int lpr_write(uint8_t minor, uint8_t rawflag, uint8_t flag);
+int lpr_open(uint_fast8_t minor, uint16_t flag);
+int lpr_close(uint_fast8_t minor);
+int lpr_write(uint_fast8_t minor, uint_fast8_t rawflag, uint_fast8_t flag);
 
 #endif

diff --git a/Kernel/platform-sam/devtty.c b/Kernel/platform-sam/devtty.c
index 4b9cc7b..3e46cb1 100644 (file)
--- a/Kernel/platform-sam/devtty.c
+++ b/Kernel/platform-sam/devtty.c
@@ -13,8 +13,8 @@ static uint8_t vmode = 2;
 
 __sfr __at 252 vmpr;
 
-static char tbuf1[TTYSIZ];
-static char tbuf2[TTYSIZ];
+static uint8_t tbuf1[TTYSIZ];
+static uint8_t tbuf2[TTYSIZ];
 
 struct vt_repeat keyrepeat = { 50, 5 };
 
@@ -38,19 +38,19 @@ tcflag_t *termios_mask[NUM_DEV_TTY + 1] = {
 };
 
 /* Write to system console */
-void kputchar(char c)
+void kputchar(uint_fast8_t c)
 {
     if(c=='\n')
         tty_putc(1, '\r');
     tty_putc(1, c);
 }
 
-uint8_t tty_writeready(uint8_t minor)
+uint_fast8_t tty_writeready(uint_fast8_t minor)
 {
     return TTY_READY_NOW;
 }
 
-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)
@@ -62,20 +62,20 @@ void tty_interrupt(void)
 {
 }
 
-void tty_setup(uint8_t minor, uint8_t flags)
+void tty_setup(uint_fast8_t minor, uint_fast8_t flags)
 {
 }
 
-int tty_carrier(uint8_t minor)
+int tty_carrier(uint_fast8_t minor)
 {
     return 1;
 }
 
-void tty_sleeping(uint8_t minor)
+void tty_sleeping(uint_fast8_t minor)
 {
 }
 
-void tty_data_consumed(uint8_t minor)
+void tty_data_consumed(uint_fast8_t minor)
 {
 }
 
@@ -322,7 +322,7 @@ static struct display samdisplay[4] = {
  *     We keep the full 24K allocated in a fixed place. When we switch modes
  *     we don't try and do any clever reclaiming.
  */
-int gfx_ioctl(uint8_t minor, uarg_t arg, char *ptr)
+int gfx_ioctl(uint_fast8_t minor, uarg_t arg, char *ptr)
 {
        uint8_t m;
        if (minor != 1 || arg >> 8 != 0x03)

diff --git a/Kernel/platform-sam/devtty.h b/Kernel/platform-sam/devtty.h
index 4f359fa..a5f3c8f 100644 (file)
--- a/Kernel/platform-sam/devtty.h
+++ b/Kernel/platform-sam/devtty.h
@@ -19,6 +19,6 @@ extern uint8_t keymap[9];
 extern uint8_t keyboard[9][8];
 extern uint8_t shiftkeyboard[9][8];
 
-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-sam/msm6242b.c b/Kernel/platform-sam/msm6242b.c
index 9d7e68c..be79941 100644 (file)
--- a/Kernel/platform-sam/msm6242b.c
+++ b/Kernel/platform-sam/msm6242b.c
@@ -11,7 +11,7 @@
 static uint8_t rtc_buf[6];
 uint8_t samrtc;
 
-uint8_t platform_rtc_secs(void)
+uint_fast8_t platform_rtc_secs(void)
 {
     uint8_t r, v;
 

diff --git a/Kernel/platform-sbcv2/devtty.c b/Kernel/platform-sbcv2/devtty.c
index 0960d81..602fc12 100644 (file)
--- a/Kernel/platform-sbcv2/devtty.c
+++ b/Kernel/platform-sbcv2/devtty.c
@@ -36,8 +36,8 @@ __sfr __at 0x6F uart_scr;
 /*
  *     One buffer for each tty
  */
-static char tbuf1[TTYSIZ];
-static char tbuf2[TTYSIZ];
+static uint8_t tbuf1[TTYSIZ];
+static uint8_t tbuf2[TTYSIZ];
 
 static uint8_t sleeping;
 
@@ -91,7 +91,7 @@ uint8_t ttymap[NUM_DEV_TTY + 1] = {
 /* Write to system console. This is the backend to all the kernel messages,
    kprintf(), panic() etc. */
 
-void kputchar(char c)
+void kputchar(uint_fast8_t c)
 {
        while(tty_writeready(1) != TTY_READY_NOW);
        if (c == '\n')
@@ -120,7 +120,7 @@ void kputchar(char c)
  *
  *     A video display that never blocks will just return TTY_READY_NOW
  */
-uint8_t tty_writeready(uint8_t minor)
+uint_fast8_t tty_writeready(uint_fast8_t minor)
 {
        /* FIXME: flow control */
        if (ttymap[minor] == 1)
@@ -137,7 +137,7 @@ uint8_t tty_writeready(uint8_t minor)
  *     If the character echo doesn't fit just drop it. It should pretty much
  *     never occur and there is nothing else to do.
  */
-void tty_putc(uint8_t minor, unsigned char c)
+void tty_putc(uint_fast8_t minor ,uint_fast8_t c)
 {
        if (ttymap[minor] == 1)
                uart_tx = c;
@@ -177,7 +177,7 @@ static uint16_t clocks[] = {
  *     That needs tidying up in many platforms and we also need a proper way
  *     to say 'this port is fixed config' before making it so.
  */
-void tty_setup(uint8_t minor, uint8_t flags)
+void tty_setup(uint_fast8_t minor, uint_fast8_t flags)
 {
        uint8_t d;
        uint16_t w;
@@ -208,7 +208,7 @@ void tty_setup(uint8_t minor, uint8_t flags)
  *     This function is called when the kernel is about to sleep on a tty.
  *     We don't care about this.
  */
-void tty_sleeping(uint8_t minor)
+void tty_sleeping(uint_fast8_t minor)
 {
        sleeping |= (1 << minor);
 }
@@ -218,7 +218,7 @@ void tty_sleeping(uint8_t minor)
  *     no carrier signal always return 1. It is used to block a port on open
  *     until carrier.
  */
-int tty_carrier(uint8_t minor)
+int tty_carrier(uint_fast8_t minor)
 {
         if (ttymap[minor] == 1)
                return uart_msr & 0x80;
@@ -229,7 +229,7 @@ int tty_carrier(uint8_t minor)
  *     When the input queue is part drained this method is called from the
  *     kernel so that hardware flow control signals can be updated.
  */
-void tty_data_consumed(uint8_t minor)
+void tty_data_consumed(uint_fast8_t minor)
 {
        used(minor);
 }

diff --git a/Kernel/platform-sc108/devtty.c b/Kernel/platform-sc108/devtty.c
index d7c230b..992722e 100644 (file)
--- a/Kernel/platform-sc108/devtty.c
+++ b/Kernel/platform-sc108/devtty.c
@@ -70,7 +70,7 @@ static uint16_t siobaud[] = {
        0x02    /* 115200 */
 };
 
-static void sio2_setup(uint8_t minor, uint8_t flags)
+static void sio2_setup(uint_fast8_t minor, uint_fast8_t flags)
 {
        struct termios *t = &ttydata[minor].termios;
        uint8_t r;
@@ -107,7 +107,7 @@ static void sio2_setup(uint8_t minor, uint8_t flags)
        sio_r[5] = 0x8A | ((t->c_cflag & CSIZE) << 1);
 }
 
-void tty_setup(uint8_t minor, uint8_t flags)
+void tty_setup(uint_fast8_t minor, uint_fast8_t flags)
 {
        if (sio_present || sio1_present) {
                sio2_setup(minor, flags);
@@ -155,7 +155,7 @@ void tty_setup(uint8_t minor, uint8_t flags)
        }
 }
 
-int tty_carrier(uint8_t minor)
+int tty_carrier(uint_fast8_t minor)
 {
         uint8_t c;
         uint8_t port;
@@ -302,7 +302,7 @@ void tty_pollirq_acia(void)
        }
 }
 
-void tty_putc(uint8_t minor, unsigned char c)
+void tty_putc(uint_fast8_t minor, uint_fast8_t c)
 {
        if (acia_present)
                SIOA_D = c;
@@ -312,7 +312,7 @@ void tty_putc(uint8_t minor, unsigned char c)
        }
 }
 
-void tty_sleeping(uint8_t minor)
+void tty_sleeping(uint_fast8_t minor)
 {
        sleeping |= (1 << minor);
 }
@@ -325,7 +325,7 @@ void tty_sleeping(uint8_t minor)
 
    Need to review this we should be ok as the IRQ handler always leaves
    us pointing at RR0 */
-ttyready_t tty_writeready(uint8_t minor)
+ttyready_t tty_writeready(uint_fast8_t minor)
 {
        irqflags_t irq;
        uint8_t c;
@@ -349,13 +349,13 @@ ttyready_t tty_writeready(uint8_t minor)
        return TTY_READY_SOON;
 }
 
-void tty_data_consumed(uint8_t minor)
+void tty_data_consumed(uint_fast8_t minor)
 {
        used(minor);
 }
 
 /* kernel writes to system console -- never sleep! */
-void kputchar(char c)
+void kputchar(uint_fast8_t c)
 {
        while(tty_writeready(TTYDEV - 512) != TTY_READY_NOW);
        if (c == '\n')
@@ -364,7 +364,7 @@ void kputchar(char c)
        tty_putc(TTYDEV - 512, c);
 }
 
-int rctty_open(uint8_t minor, uint16_t flag)
+int rctty_open(uint_fast8_t minor, uint16_t flag)
 {
        if (acia_present && minor != 1) {
                udata.u_error = ENODEV;

diff --git a/Kernel/platform-sc108/devtty.h b/Kernel/platform-sc108/devtty.h
index 6bc732c..463d20c 100644 (file)
--- a/Kernel/platform-sc108/devtty.h
+++ b/Kernel/platform-sc108/devtty.h
@@ -1,10 +1,10 @@
 #ifndef __DEVTTY_DOT_H__
 #define __DEVTTY_DOT_H__
 
-void tty_putc(uint8_t minor, unsigned char c);
+void tty_putc(uint8_t minor, uint_fast8_t c);
 void tty_pollirq_sio0(void);
 void tty_pollirq_sio1(void);
 void tty_pollirq_acia(void);
-int rctty_open(uint8_t minor, uint16_t flag);
+int rctty_open(uint_fast8_t minor, uint16_t flag);
 
 #endif