diff options
author | Flavio Cruz <flaviocruz@gmail.com> | 2022-12-06 00:33:41 -0500 |
---|---|---|
committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2022-12-06 21:27:53 +0100 |
commit | c925ed9fd3bf4d4fb8a3e6306cda19040cd54627 (patch) | |
tree | bb974414bebe35c7dfa24e0396425d1fd5f3d19a /i386/i386at/com.c | |
parent | 2a7263559572f178322451a6a1e0a43dc90cdb32 (diff) | |
download | gnumach-c925ed9fd3bf4d4fb8a3e6306cda19040cd54627.tar.gz gnumach-c925ed9fd3bf4d4fb8a3e6306cda19040cd54627.tar.bz2 gnumach-c925ed9fd3bf4d4fb8a3e6306cda19040cd54627.zip |
Define vm_size_t and vm_offset_t as __mach_uintptr_t.
This allows *printf to use %zd/%zu/%zx to print vm_size_t and
vm_offset_t. Warnings using the incorrect specifiers were fixed.
Note that MACH_PORT_NULL became just 0 because GCC thinks that we were
comparing a pointer to a character (due to it being an unsigned int) so
I removed the explicit cast.
Message-Id: <Y47UNdcUF35Ag4Vw@reue>
Diffstat (limited to 'i386/i386at/com.c')
-rw-r--r-- | i386/i386at/com.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/i386/i386at/com.c b/i386/i386at/com.c index d5842d8f..8bd80206 100644 --- a/i386/i386at/com.c +++ b/i386/i386at/com.c @@ -235,7 +235,7 @@ comattach(struct bus_device *dev) } take_dev_irq(dev); - printf(", port = %lx, spl = %ld, pic = %d. (DOS COM%d)", + printf(", port = %zx, spl = %zu, pic = %d. (DOS COM%d)", dev->address, dev->sysdep, dev->sysdep1, unit+1); /* comcarrier[unit] = addr->flags;*/ @@ -861,11 +861,11 @@ void compr_addr(vm_offset_t addr) /* The two line_stat prints may show different values, since * touching some of the registers constitutes changing them. */ - printf("LINE_STAT(%lu) %x\n", + printf("LINE_STAT(%zu) %x\n", LINE_STAT(addr), inb(LINE_STAT(addr))); - printf("TXRX(%lu) %x, INTR_ENAB(%lu) %x, INTR_ID(%lu) %x, LINE_CTL(%lu) %x,\n\ -MODEM_CTL(%lu) %x, LINE_STAT(%lu) %x, MODEM_STAT(%lu) %x\n", + printf("TXRX(%zu) %x, INTR_ENAB(%zu) %x, INTR_ID(%zu) %x, LINE_CTL(%zu) %x,\n\ +MODEM_CTL(%zu) %x, LINE_STAT(%zu) %x, MODEM_STAT(%zu) %x\n", TXRX(addr), inb(TXRX(addr)), INTR_ENAB(addr), inb(INTR_ENAB(addr)), INTR_ID(addr), inb(INTR_ID(addr)), |