diff options
| author | Michael Brown | 2016-02-16 17:28:12 +0100 |
|---|---|---|
| committer | Michael Brown | 2016-02-16 20:32:32 +0100 |
| commit | 9f79f5f1a5b56501a8835fa9e01e6f36d8ee614a (patch) | |
| tree | d4fc436fba9e46587d1a945dbdc9401b5eef952c /src/arch/i386 | |
| parent | [bios] Use intptr_t when casting .text16 function pointers (diff) | |
| download | ipxe-9f79f5f1a5b56501a8835fa9e01e6f36d8ee614a.tar.gz ipxe-9f79f5f1a5b56501a8835fa9e01e6f36d8ee614a.tar.xz ipxe-9f79f5f1a5b56501a8835fa9e01e6f36d8ee614a.zip | |
[bios] Use size_t when casting _text16_memsz and _data16_memsz
Signed-off-by: Michael Brown <mcb30@ipxe.org>
Diffstat (limited to 'src/arch/i386')
| -rw-r--r-- | src/arch/i386/firmware/pcbios/hidemem.c | 4 | ||||
| -rw-r--r-- | src/arch/i386/interface/pxe/pxe_call.c | 9 |
2 files changed, 7 insertions, 6 deletions
diff --git a/src/arch/i386/firmware/pcbios/hidemem.c b/src/arch/i386/firmware/pcbios/hidemem.c index 9f9e4f5f..a3728123 100644 --- a/src/arch/i386/firmware/pcbios/hidemem.c +++ b/src/arch/i386/firmware/pcbios/hidemem.c @@ -76,9 +76,9 @@ extern struct segoff __text16 ( int15_vector ); extern char _textdata[]; extern char _etextdata[]; extern char _text16_memsz[]; -#define _text16_memsz ( ( unsigned int ) _text16_memsz ) +#define _text16_memsz ( ( size_t ) _text16_memsz ) extern char _data16_memsz[]; -#define _data16_memsz ( ( unsigned int ) _data16_memsz ) +#define _data16_memsz ( ( size_t ) _data16_memsz ) /** * Hide region of memory from system memory map diff --git a/src/arch/i386/interface/pxe/pxe_call.c b/src/arch/i386/interface/pxe/pxe_call.c index dd5f8849..67118299 100644 --- a/src/arch/i386/interface/pxe/pxe_call.c +++ b/src/arch/i386/interface/pxe/pxe_call.c @@ -56,9 +56,11 @@ static int int_1a_hooked = 0; /** Real-mode code segment size */ extern char _text16_memsz[]; +#define _text16_memsz ( ( size_t ) _text16_memsz ) /** Real-mode data segment size */ extern char _data16_memsz[]; +#define _data16_memsz ( ( size_t ) _data16_memsz ) /** PXENV_UNDI_TRANSMIT API call profiler */ static struct profiler pxe_api_tx_profiler __profiler = @@ -337,10 +339,9 @@ int pxe_start_nbp ( void ) { int discard_b, discard_c, discard_d, discard_D; uint16_t status; - DBGC ( &pxe_netdev, "PXE NBP starting with netdev %s, code %04x:%04x, " - "data %04x:%04x\n", ( pxe_netdev ? pxe_netdev->name : "<none>" ), - rm_cs, ( ( unsigned int ) _text16_memsz ), - rm_ds, ( ( unsigned int ) _data16_memsz ) ); + DBGC ( &pxe_netdev, "PXE NBP starting with netdev %s, code %04x:%04zx, " + "data %04x:%04zx\n", ( pxe_netdev ? pxe_netdev->name : "<none>"), + rm_cs, _text16_memsz, rm_ds, _data16_memsz ); /* Allow restarting NBP via PXENV_RESTART_TFTP */ jmp = rmsetjmp ( pxe_restart_nbp ); |