From: David Given Date: Mon, 19 Oct 2015 17:50:44 +0000 (+0200) Subject: Fix some whitespace changes that shouldn't have been changed (for cleaner X-Git-Url: https://git.ndcode.org/public/gitweb.cgi?a=commitdiff_plain;h=e95ebb4635fd496285e9969f861b0fd989002160;p=FUZIX.git Fix some whitespace changes that shouldn't have been changed (for cleaner diffs with upstream). --- diff --git a/Kernel/dev/blkdev.c b/Kernel/dev/blkdev.c index 2bbc2473..8791ecf0 100644 --- a/Kernel/dev/blkdev.c +++ b/Kernel/dev/blkdev.c @@ -126,8 +126,8 @@ static int blkdev_transfer(uint8_t minor, uint8_t rawflag) goto xferfail; blk_op.nblock -= n; count += n; - blk_op.addr += n * BLKSIZE; - blk_op.lba += n; + blk_op.addr += n * BLKSIZE; + blk_op.lba += n; } return count; /* 10/10, would transfer sectors again */ diff --git a/Kernel/devio.c b/Kernel/devio.c index e4b19754..4d77b224 100644 --- a/Kernel/devio.c +++ b/Kernel/devio.c @@ -498,10 +498,10 @@ void kputhex(unsigned int v) void kputunum(unsigned int v) { unsigned char n = 0; - putdigit((v / 10000) % 10, &n); - putdigit((v / 1000) % 10, &n); - putdigit((v / 100) % 10, &n); - putdigit((v / 10) % 10, &n); + putdigit((v / 10000) % 10, &n); + putdigit((v / 1000) % 10, &n); + putdigit((v / 100) % 10, &n); + putdigit((v / 10) % 10, &n); putdigit0(v % 10); } diff --git a/Kernel/start.c b/Kernel/start.c index 429962d3..9ee09b43 100644 --- a/Kernel/start.c +++ b/Kernel/start.c @@ -55,7 +55,14 @@ void fstabinit(void) } } -/* FIXME: pass remainder of boot argument to init, also word align */ +/* FIXME: pass remainder of boot argument to init */ +/* Remember two things when modifying this code + 1. Some processors need 2 byte alignment or better of arguments. We + lay it out for 4 + 2. We are going to end up with cases where user and kernel pointer + size differ due to memory models etc. We use uputp and we allow + room for the pointers to be bigger than kernel */ + void create_init(void) { uint8_t *j;