diff options
| author | Reyk Floeter <reyk@cvs.openbsd.org> | 2007-05-01 11:44:48 +0000 |
|---|---|---|
| committer | Reyk Floeter <reyk@cvs.openbsd.org> | 2007-05-01 11:44:48 +0000 |
| commit | 5f264daed90f5a6c3f817b973e83e4678ca1a91b (patch) | |
| tree | f53adac27fd6e10747b918fdc4994cb5b0d6ab56 /sys/dev/pci/if_nxreg.h | |
| parent | 868d765569987bf1d96fe6287713c34d48399de1 (diff) | |
shuffle some code and add additional states in the reset path. use a
scheduled timeout to check for the boot process to finish in the reset
code instead of waiting for a loooong delay (still use the long delay
in the initial boot on attach because i cannot defer the
initialization there).
Diffstat (limited to 'sys/dev/pci/if_nxreg.h')
| -rw-r--r-- | sys/dev/pci/if_nxreg.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/sys/dev/pci/if_nxreg.h b/sys/dev/pci/if_nxreg.h index c0ca5da8419..8f2a37e33cf 100644 --- a/sys/dev/pci/if_nxreg.h +++ b/sys/dev/pci/if_nxreg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_nxreg.h,v 1.16 2007/05/01 02:25:31 reyk Exp $ */ +/* $OpenBSD: if_nxreg.h,v 1.17 2007/05/01 11:44:47 reyk Exp $ */ /* * Copyright (c) 2007 Reyk Floeter <reyk@openbsd.org> @@ -44,10 +44,11 @@ enum nx_state { NX_S_FAIL = -1, /* Failed to initialize the device */ NX_S_OFFLINE = 0, /* Firmware is not active yet */ - NX_S_RESET = 1, /* Firmware is in reset state */ - NX_S_BOOT = 2, /* Chipset is booting the firmware */ - NX_S_LOADED = 3, /* Firmware is loaded but not initialized */ - NX_S_READY = 4 /* Device has been initialized and is ready */ + NX_S_RESET = 2, /* Firmware is in reset state */ + NX_S_BOOT = 3, /* Chipset is booting the firmware */ + NX_S_LOADED = 4, /* Firmware is loaded but not initialized */ + NX_S_RELOADED = 5, /* Firmware is reloaded and initialized */ + NX_S_READY = 6 /* Device has been initialized and is ready */ }; /* @@ -189,6 +190,7 @@ struct nx_statusdesc { #define NXFLASHMAP_INFO 0x00004000 /* board configuration */ #define NXFLASHMAP_INITCODE 0x00006000 /* chipset-specific code */ #define NXFLASHMAP_BOOTLOADER 0x00010000 /* boot loader */ +#define NXFLASHMAP_BOOTLDSIZE 1024 /* boot loader size */ #define NXFLASHMAP_FIRMWARE_0 0x00043000 /* compressed firmware image */ #define NXFLASHMAP_FIRMWARE_1 0x00200000 /* backup firmware image */ #define NXFLASHMAP_PXE 0x003d0000 /* PXE image */ |