diff options
| author | YASUOKA Masahiko <yasuoka@cvs.openbsd.org> | 2015-09-02 04:09:25 +0000 |
|---|---|---|
| committer | YASUOKA Masahiko <yasuoka@cvs.openbsd.org> | 2015-09-02 04:09:25 +0000 |
| commit | 25c065e3fb0f3cf72fd4ccd77fbb5f3b9bf41e5d (patch) | |
| tree | 9300d5f16470a49c31de5f3c54ae45f6c4b97b38 /sys/arch/i386/stand/libsa/disk.h | |
| parent | 493c06b693cc5008b2512212aa374ee840d0a565 (diff) | |
Bring the boot changes on amd64 to i386. alloca is deleted.
Also fix the boot from BIOS and bump the version.
input and ok deraadt
Diffstat (limited to 'sys/arch/i386/stand/libsa/disk.h')
| -rw-r--r-- | sys/arch/i386/stand/libsa/disk.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/sys/arch/i386/stand/libsa/disk.h b/sys/arch/i386/stand/libsa/disk.h index e1ea7b262c6..5ad8df3c64b 100644 --- a/sys/arch/i386/stand/libsa/disk.h +++ b/sys/arch/i386/stand/libsa/disk.h @@ -1,4 +1,4 @@ -/* $OpenBSD: disk.h,v 1.5 2012/10/31 13:55:58 jsing Exp $ */ +/* $OpenBSD: disk.h,v 1.6 2015/09/02 04:09:24 yasuoka Exp $ */ /* * Copyright (c) 1997 Tobias Weingartner @@ -32,12 +32,19 @@ #include <sys/queue.h> +struct efi_diskinfo; +typedef struct efi_diskinfo *efi_diskinfo_t; + /* All the info on a disk we've found */ struct diskinfo { + efi_diskinfo_t efi_info; bios_diskinfo_t bios_info; struct disklabel disklabel; struct sr_boot_volume *sr_vol; + int (*diskio)(int, struct diskinfo *, u_int, int, void *); + int (*strategy)(void *, int, daddr32_t, size_t, void *, size_t *); + dev_t bsddev, bootdev; TAILQ_ENTRY(diskinfo) list; |