narenas
/
opengnsys_ipxe
mirror of https://github.com/ipxe/ipxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[bios] Use size_t when casting _text16_memsz and _data16_memsz 

Signed-off-by: Michael Brown <mcb30@ipxe.org>
pull/45/head
Michael Brown 2016-02-16 16:28:12 +00:00
parent 15fadab533
commit 9f79f5f1a5
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/arch/i386/firmware/pcbios/hidemem.c
View File

@ -76,9 +76,9 @@ extern struct segoff __text16 ( int15_vector );
extern char _textdata[]; extern char _textdata[];
extern char _etextdata[]; extern char _etextdata[];
extern char _text16_memsz[]; extern char _text16_memsz[];
#define _text16_memsz ( ( unsigned int ) _text16_memsz ) #define _text16_memsz ( ( size_t ) _text16_memsz )
extern char _data16_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 * Hide region of memory from system memory map

9
src/arch/i386/interface/pxe/pxe_call.c
View File

@ -56,9 +56,11 @@ static int int_1a_hooked = 0;
/** Real-mode code segment size */ /** Real-mode code segment size */
extern char _text16_memsz[]; extern char _text16_memsz[];
#define _text16_memsz ( ( size_t ) _text16_memsz )
/** Real-mode data segment size */ /** Real-mode data segment size */
extern char _data16_memsz[]; extern char _data16_memsz[];
#define _data16_memsz ( ( size_t ) _data16_memsz )
/** PXENV_UNDI_TRANSMIT API call profiler */ /** PXENV_UNDI_TRANSMIT API call profiler */
static struct profiler pxe_api_tx_profiler __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; int discard_b, discard_c, discard_d, discard_D;
uint16_t status; uint16_t status;
DBGC ( &pxe_netdev, "PXE NBP starting with netdev %s, code %04x:%04x, " DBGC ( &pxe_netdev, "PXE NBP starting with netdev %s, code %04x:%04zx, "
"data %04x:%04x\n", ( pxe_netdev ? pxe_netdev->name : "<none>" ), "data %04x:%04zx\n", ( pxe_netdev ? pxe_netdev->name : "<none>"),
rm_cs, ( ( unsigned int ) _text16_memsz ), rm_cs, _text16_memsz, rm_ds, _data16_memsz );
rm_ds, ( ( unsigned int ) _data16_memsz ) );
/* Allow restarting NBP via PXENV_RESTART_TFTP */ /* Allow restarting NBP via PXENV_RESTART_TFTP */
jmp = rmsetjmp ( pxe_restart_nbp ); jmp = rmsetjmp ( pxe_restart_nbp );