david/ipxe
david
/
ipxe
Archived
1
0
Fork 0

UNDI loader routine now works

This commit is contained in:
Michael Brown 2007-01-05 16:11:05 +00:00
parent 477a70697a
commit fa9055197d
1 changed files with 22 additions and 5 deletions

View File

@ -22,6 +22,7 @@
#include <pxe.h>
#include <realmode.h>
#include <bios.h>
#include <pnpbios.h>
/** @file
*
@ -118,6 +119,7 @@ static int pxedrv_parse_pcirheader ( struct pxe_driver *pxedrv,
static int pxedrv_probe_rom ( unsigned int rom_segment ) {
struct pxe_driver *pxedrv = NULL;
struct undi_rom rom;
size_t rom_len;
unsigned int pxeromid;
unsigned int pcirheader;
int rc;
@ -128,6 +130,7 @@ static int pxedrv_probe_rom ( unsigned int rom_segment ) {
rc = -EINVAL;
goto err;
}
rom_len = ( rom.ROMLength * 512 );
/* Allocate memory for PXE driver */
pxedrv = malloc ( sizeof ( *pxedrv ) );
@ -137,8 +140,8 @@ static int pxedrv_probe_rom ( unsigned int rom_segment ) {
goto err;
}
memset ( pxedrv, 0, sizeof ( *pxedrv ) );
DBGC ( pxedrv, "PXEDRV %p using expansion ROM at %04x:0000 (%zdkB)\n",
pxedrv, rom_segment, ( rom.ROMLength / 2 ) );
DBGC ( pxedrv, "PXEDRV %p trying expansion ROM at %04x:0000 (%zdkB)\n",
pxedrv, rom_segment, ( rom_len / 1024 ) );
pxedrv->rom_segment = rom_segment;
/* Check for and parse PXE ROM ID */
@ -148,6 +151,11 @@ static int pxedrv_probe_rom ( unsigned int rom_segment ) {
rc = -EINVAL;
goto err;
}
if ( pxeromid > rom_len ) {
DBGC ( pxedrv, "PXEDRV %p PXE ROM ID outside ROM\n", pxedrv );
rc = -EINVAL;
goto err;
}
if ( ( rc = pxedrv_parse_pxeromid ( pxedrv, pxeromid ) ) != 0 )
goto err;
@ -245,17 +253,26 @@ static SEGOFF16_t __data16 ( undi_loader_entry );
static int pxedrv_load ( struct pxe_driver *pxedrv, struct pxe_device *pxe,
unsigned int pci_busdevfn, unsigned int isapnp_csn,
unsigned int isapnp_read_port ) {
int discard;
uint16_t exit;
int pnpbios_offset;
uint16_t fbms;
unsigned int fbms_seg;
int discard;
uint16_t exit;
int rc;
/* Record device location information */
memset ( &undi_loader, 0, sizeof ( undi_loader ) );
undi_loader.AX = pci_busdevfn;
undi_loader.BX = isapnp_csn;
undi_loader.DX = isapnp_read_port;
/* Set up PnP BIOS pointer, if PnP BIOS present */
pnpbios_offset = find_pnp_bios();
if ( pnpbios_offset >= 0 ) {
undi_loader.ES = BIOS_SEG;
undi_loader.DI = pnpbios_offset;
}
/* Allocate base memory for PXE stack */
get_real ( fbms, BDA_SEG, BDA_FBMS );
fbms_seg = ( fbms << 6 );
@ -279,7 +296,7 @@ static int pxedrv_load ( struct pxe_driver *pxedrv, struct pxe_device *pxe,
rc = -undi_loader.Status;
if ( rc == 0 ) /* Paranoia */
rc = -EIO;
DBGC ( pxedrv, "PXEDRV %p loader failed: %s\n",
DBGC ( pxedrv, "PXEDRV %p loader failed: %s\n", pxedrv,
strerror ( rc ) );
return rc;
}