SeaBIOS

seabios@seabios.org

2 participants
3799 discussions

Re: [SeaBIOS] [PATCH 4/4] Start using Kconfig to configure SeaBIOS settings.
by Stefan Reinauer 28 Jan '11

28 Jan '11

* Kevin O'Connor <kevin(a)koconnor.net> [110127 03:38]: > Create autoconf.h during the build. > > Move a couple of config settings from config.h to Kconfig. > --- a/Makefile > +++ b/Makefile > @@ -119,11 +119,11 @@ $(OUT)asm-offsets.h: $(OUT)asm-offsets.s > $(Q)./tools/gen-offsets.sh $< $@ > > > -$(OUT)ccode.16.s: ; $(call whole-compile, $(CFLAGS16) -S, $(addprefix src/, $(SRC16)),$@) > +$(OUT)ccode.16.s: out/autoconf.h ; $(call whole-compile, $(CFLAGS16) -S, $(addprefix src/, $(SRC16)),$@) > > -$(OUT)code32seg.o: ; $(call whole-compile, $(CFLAGS32SEG), $(addprefix src/, $(SRC32SEG)),$@) > +$(OUT)code32seg.o: out/autoconf.h ; $(call whole-compile, $(CFLAGS32SEG), $(addprefix src/, $(SRC32SEG)),$@) > > -$(OUT)ccode32flat.o: ; $(call whole-compile, $(CFLAGS32FLAT), $(addprefix src/, $(SRC32FLAT)),$@) > +$(OUT)ccode32flat.o: out/autoconf.h ; $(call whole-compile, $(CFLAGS32FLAT), $(addprefix src/, $(SRC32FLAT)),$@) I think this should be $(OUT) not out/ Stefan

2 1

Re: [SeaBIOS] [PATCH 4/4] Start using Kconfig to configure SeaBIOS settings.
by Kevin O'Connor 27 Jan '11

27 Jan '11

On Wed, Jan 26, 2011 at 09:38:57PM -0500, Kevin O'Connor wrote: > Create autoconf.h during the build. > > Move a couple of config settings from config.h to Kconfig. [...] > --- /dev/null > +++ b/src/defconfig > @@ -0,0 +1,6 @@ > +# SeaBIOS default configuration On closer inspection, it's possible to have Kconfig generate the default config from the Kconfig file. So, it's not necessary to commit a "defconfig" file. -Kevin

1 0

[PATCH 0/4] Minimal import of Kconfig
by Kevin O'Connor 27 Jan '11

27 Jan '11

This patch series adds Kconfig to SeaBIOS. The goal is to do this with a minimal impact to the current SeaBIOS build and config system. Further build and config changes can be done in subsequent patches. This imports the latest Kconfig from the Linux 2.6 tree. -Kevin Kevin O'Connor (4): Initial commit of Kconfig build tool. Build changes for Linux kconfig code to work in seabios dir structure. Change kconfig to emit disabled symbols in autoconf.h. Start using Kconfig to configure SeaBIOS settings. .gitignore | 2 + Makefile | 27 +- src/Kconfig | 15 + src/config.h | 11 +- src/defconfig | 6 + tools/kconfig/.gitignore | 23 + tools/kconfig/Makefile | 361 +++++ tools/kconfig/POTFILES.in | 12 + tools/kconfig/check.sh | 14 + tools/kconfig/conf.c | 654 ++++++++ tools/kconfig/confdata.c | 1062 +++++++++++++ tools/kconfig/expr.c | 1173 ++++++++++++++ tools/kconfig/expr.h | 231 +++ tools/kconfig/gconf.c | 1577 +++++++++++++++++++ tools/kconfig/gconf.glade | 661 ++++++++ tools/kconfig/images.c | 326 ++++ tools/kconfig/kconfig_load.c | 35 + tools/kconfig/kxgettext.c | 236 +++ tools/kconfig/lex.zconf.c_shipped | 2430 +++++++++++++++++++++++++++++ tools/kconfig/lkc.h | 196 +++ tools/kconfig/lkc_proto.h | 53 + tools/kconfig/lxdialog/.gitignore | 4 + tools/kconfig/lxdialog/BIG.FAT.WARNING | 4 + tools/kconfig/lxdialog/check-lxdialog.sh | 84 + tools/kconfig/lxdialog/checklist.c | 332 ++++ tools/kconfig/lxdialog/dialog.h | 230 +++ tools/kconfig/lxdialog/inputbox.c | 238 +++ tools/kconfig/lxdialog/menubox.c | 434 ++++++ tools/kconfig/lxdialog/textbox.c | 391 +++++ tools/kconfig/lxdialog/util.c | 657 ++++++++ tools/kconfig/lxdialog/yesno.c | 114 ++ tools/kconfig/mconf.c | 862 ++++++++++ tools/kconfig/menu.c | 609 ++++++++ tools/kconfig/nconf.c | 1561 +++++++++++++++++++ tools/kconfig/nconf.gui.c | 617 ++++++++ tools/kconfig/nconf.h | 96 ++ tools/kconfig/qconf.cc | 1787 +++++++++++++++++++++ tools/kconfig/qconf.h | 337 ++++ tools/kconfig/symbol.c | 1260 +++++++++++++++ tools/kconfig/util.c | 138 ++ tools/kconfig/zconf.gperf | 47 + tools/kconfig/zconf.hash.c_shipped | 245 +++ tools/kconfig/zconf.l | 360 +++++ tools/kconfig/zconf.tab.c_shipped | 2505 ++++++++++++++++++++++++++++++ tools/kconfig/zconf.y | 749 +++++++++ 45 files changed, 22754 insertions(+), 12 deletions(-) create mode 100644 src/Kconfig create mode 100644 src/defconfig create mode 100644 tools/kconfig/.gitignore create mode 100644 tools/kconfig/Makefile create mode 100644 tools/kconfig/POTFILES.in create mode 100755 tools/kconfig/check.sh create mode 100644 tools/kconfig/conf.c create mode 100644 tools/kconfig/confdata.c create mode 100644 tools/kconfig/expr.c create mode 100644 tools/kconfig/expr.h create mode 100644 tools/kconfig/gconf.c create mode 100644 tools/kconfig/gconf.glade create mode 100644 tools/kconfig/images.c create mode 100644 tools/kconfig/kconfig_load.c create mode 100644 tools/kconfig/kxgettext.c create mode 100644 tools/kconfig/lex.zconf.c_shipped create mode 100644 tools/kconfig/lkc.h create mode 100644 tools/kconfig/lkc_proto.h create mode 100644 tools/kconfig/lxdialog/.gitignore create mode 100644 tools/kconfig/lxdialog/BIG.FAT.WARNING create mode 100644 tools/kconfig/lxdialog/check-lxdialog.sh create mode 100644 tools/kconfig/lxdialog/checklist.c create mode 100644 tools/kconfig/lxdialog/dialog.h create mode 100644 tools/kconfig/lxdialog/inputbox.c create mode 100644 tools/kconfig/lxdialog/menubox.c create mode 100644 tools/kconfig/lxdialog/textbox.c create mode 100644 tools/kconfig/lxdialog/util.c create mode 100644 tools/kconfig/lxdialog/yesno.c create mode 100644 tools/kconfig/mconf.c create mode 100644 tools/kconfig/menu.c create mode 100644 tools/kconfig/nconf.c create mode 100644 tools/kconfig/nconf.gui.c create mode 100644 tools/kconfig/nconf.h create mode 100644 tools/kconfig/qconf.cc create mode 100644 tools/kconfig/qconf.h create mode 100644 tools/kconfig/symbol.c create mode 100644 tools/kconfig/util.c create mode 100644 tools/kconfig/zconf.gperf create mode 100644 tools/kconfig/zconf.hash.c_shipped create mode 100644 tools/kconfig/zconf.l create mode 100644 tools/kconfig/zconf.tab.c_shipped create mode 100644 tools/kconfig/zconf.y -- 1.7.3.4

1 4

Re: [SeaBIOS] Kconfig for SeaBIOS finally
by Kevin O'Connor 25 Jan '11

25 Jan '11

On Mon, Jan 17, 2011 at 09:13:47PM +0100, Marc Bertens wrote: > Kevin, > > This is the final patch for Kconfig for SeaBIOS. > > Tested-by Marc Bertens <mbertens(a)xs4all.nl> > Signed-off Marc Bertens <mbertens(a)xs4all.nl> > > Its now all in one big patch, it has now one config.h file. This should > be straight forward. Thanks. Unfortunately, it's still too big for the mailing list. Can you post this in two patches - one that adds the tools/kconfig/ files, and one that modifies the SeaBIOS files (Makefile, src/*). I can put the tools/kconfig/ part on the web, and we can discuss the seabios parts on the mailing list. Some comments on that patch: The patch seems to be missing src/Kconfig. [...] > +#elif CONFIG_NAME_QEMU > +/* the Q-Emu name was selected */ > +#define CONFIG_APPNAME "QEMU" > +#define CONFIG_CPUNAME8 "QEMUCPU " > +#define CONFIG_APPNAME6 "QEMU " > +#define CONFIG_APPNAME4 "QEMU" > + > +#elif CONFIG_NAME_COREBOOT > +/* the Coreboot name was selected */ > +#define CONFIG_APPNAME "Coreboot" > +#define CONFIG_CPUNAME8 "CRBTCPU " > +#define CONFIG_APPNAME6 "COREBT" > +#define CONFIG_APPNAME4 "CRBT" This adds new names - which is a topic in itself. Lets have the first kconfig patch just add in the basic capabilities, and then we can add new features on top of it. I suggest leaving the names hard coded in config.h for now - setting them via kconfig can be a follow up patch. Thanks for working on this. -Kevin

3 10

[PATCH] Fix to prevent infinite loop in build_pci_path().
by Kevin O'Connor 22 Jan '11

22 Jan '11

Make sure the PCI path doesn't point to itself. --- src/pci.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/pci.c b/src/pci.c index 45f210d..944a393 100644 --- a/src/pci.c +++ b/src/pci.c @@ -194,7 +194,7 @@ pci_path_setup(void) PCIpaths = malloc_tmp(sizeof(*PCIpaths) * 256); if (!PCIpaths) return; - memset(PCIpaths, 0, sizeof(PCIpaths)); + memset(PCIpaths, 0, sizeof(*PCIpaths) * 256); int roots = 0; int bdf, max; @@ -209,7 +209,8 @@ pci_path_setup(void) if (v == PCI_HEADER_TYPE_BRIDGE || v == PCI_HEADER_TYPE_CARDBUS) { v = pci_config_readl(bdf, PCI_PRIMARY_BUS); int childbus = (v >> 8) & 0xff; - PCIpaths[childbus] = bdf | PP_PCIBRIDGE; + if (childbus > bus) + PCIpaths[childbus] = bdf | PP_PCIBRIDGE; } } } -- 1.7.3.4

1 0

[Fwd: Re: Question about linker building seabios]
by Marc Bertens 19 Jan '11

19 Jan '11

Kevin, I put in the code the following addition, its not a clean way of doing I think, but it works :-) Below the boot log (partially) that shows that piece of code. Maybe you can figure out how to do it the clean way. Marc diff --git a/src/boot.c b/src/boot.c index 05fb3dd..b57c8c0 100644 --- a/src/boot.c +++ b/src/boot.c @@ -97,13 +97,17 @@ find_prio(const char *glob) static char * build_pci_path(char *buf, int max, const char *devname, int bdf) { +static int last_bdf = 0; // Build the string path of a bdf - for example: /pci@i0cf8/isa@1,2 char *p = buf; int parent = pci_bdf_to_bus(bdf); + dprintf(1, "buf=%p max=%d name=%s bdf=%d parent=%d PCIpaths=%p\n" + , buf, max, devname, bdf, parent, PCIpaths); if (PCIpaths) parent = PCIpaths[parent]; int parentdev = parent & 0xffff; - if (parent & PP_PCIBRIDGE) { + if (parent & PP_PCIBRIDGE && last_bdf != bdf ) { + last_bdf = bdf; p = build_pci_path(p, max, "pci-bridge", parentdev); } else { if (parentdev) Searching CBFS for prefix floppyimg/ Found CBFS file fallback/romstage Found CBFS file fallback/coreboot_ram Found CBFS file fallback/payload Found CBFS file handle_08 |1ffd4000| pmm_free 0x1ffd3000 (detail=0x1ffd5760) \1ffd3000/ End thread |1ffd4000| pmm_free 0x1ffefee0 (detail=0x1ffd5820) |1ffd4000| pmm_free 0x1ffee000 (detail=0x1ffd57f0) |1ffd4000| pmm_free 0x1ffefed0 (detail=0x1ffd57c0) |1ffd4000| pmm_free 0x1ffefec0 (detail=0x1ffd5790) |1ffd4000| pmm_free 0x1ffd5880 (detail=0x1ffd58a0) |1ffd2000| pmm_free 0x1ffd4000 (detail=0x1ffd5850) \1ffd4000/ End thread |1ffd2000| ata_reset exit status=50 handle_08 |1ffd2000| send_cmd : read error (status=51 err=04) |1ffd2000| pmm_malloc zone=0x000f5284 handle=ffffffff size=40 align=10 ret=0x000fd5e0 (detail=0x1ffd58a0) |1ffd2000| pmm_malloc zone=0x000f528c handle=ffffffff size=80 align=10 ret=0x1ffd5820 (detail=0x1ffd5870) |1ffd2000| ata1-0: WDC WD800JB-22JJC0 ATA-6 Hard-Disk (74 GiBytes) |1ffd2000| buf=0x1ffd2c5c max=256 name=* bdf=57 parent=0 PCIpaths=0x1ffd5900 |1ffd2000| buf=0x1ffd2c5c max=256 name=pci-bridge bdf=121 parent=0 PCIpaths=0x1ffd5900 |1ffd2000| buf=0x1ffd2c5c max=256 name=pci-bridge bdf=121 parent=0 PCIpaths=0x1ffd5900 |1ffd2000| Searching bootorder for: /pci-root@79/pci@i0cf8/pci-bridge@f,1/pci-bridge@f,1/*@7,1/drive@1/disk@0 |1ffd2000| pmm_malloc zone=0x000f528c handle=ffffffff size=20 align=10 ret=0x1ffd57d0 (detail=0x1ffd57f0) |1ffd2000| Registering bootable: ata1-0: WDC WD800JB-22JJC0 ATA-6 Hard-Disk (74 GiBytes) (type:2 prio:103 data:fd5e0) |1ffd2000| ata_detect resetresult=600d |1ffd2000| powerup iobase=170 st=50 |1ffd2000| powerup iobase=170 st=0 |1ffd2000| ata_detect ata1-1: sc=55 sn=aa dh=b0 |1ffd2000| send_cmd : DRQ not set (status 00) pmm_free 0x1ffd2000 (detail=0x1ffd56d0) \1ffd2000/ End thread All threads complete. -------- Forwarded Message -------- From: Marc Bertens <mbertens(a)xs4all.nl> To: Kevin O'Connor <kevin(a)koconnor.net> Cc: seabios(a)seabios.org Subject: Re: [SeaBIOS] Question about linker building seabios Date: Wed, 19 Jan 2011 20:17:34 +0100 Kevin, I put in that extra debug line in you put on pastebin, and it seems that it deadloops there, see my boot log http://pastebin.com/B3fXSXAZ Marc On Mon, 2011-01-17 at 15:09 -0500, Kevin O'Connor wrote: > On Mon, Jan 17, 2011 at 08:58:41PM +0100, Marc Bertens wrote: > > It stops at 1989 > > > > Does the following fix it for you? > > --- a/src/pci.c > +++ b/src/pci.c > @@ -194,7 +194,7 @@ pci_path_setup(void) > PCIpaths = malloc_tmp(sizeof(*PCIpaths) * 256); > if (!PCIpaths) > return; > - memset(PCIpaths, 0, sizeof(PCIpaths)); > + memset(PCIpaths, 0, sizeof(*PCIpaths) * 256); > > int roots = 0; > int bdf, max; > > > > Marc > > > > On Mon, 2011-01-17 at 14:47 -0500, Kevin O'Connor wrote: > > > > > On Mon, Jan 17, 2011 at 07:35:25PM +0100, Marc Bertens wrote: > > > > Hmmm, not completely true i'm afraid. When booting a cold systen it will > > > > not come up. > > > > When i switch to my fallback rom it boots, now i switch back to the > > > > image that was not > > > > booting and now it boots just fine. > > > > > > > > So i was a little premature with my earlier mail. > > > > > > > > I added the boot log in pastebin http://pastebin.com/g83qwpnj > > > > > > That log shows SeaBIOS succesfully booting. Do you have a log where > > > seabios fails? > > > > > > -Kevin > > > > _______________________________________________ SeaBIOS mailing list SeaBIOS(a)seabios.org http://www.seabios.org/mailman/listinfo/seabios

1 0

Re: [SeaBIOS] Question about linker building seabios
by Kevin O'Connor 19 Jan '11

19 Jan '11

On Mon, Jan 17, 2011 at 08:58:41PM +0100, Marc Bertens wrote: > It stops at 1989 > Does the following fix it for you? --- a/src/pci.c +++ b/src/pci.c @@ -194,7 +194,7 @@ pci_path_setup(void) PCIpaths = malloc_tmp(sizeof(*PCIpaths) * 256); if (!PCIpaths) return; - memset(PCIpaths, 0, sizeof(PCIpaths)); + memset(PCIpaths, 0, sizeof(*PCIpaths) * 256); int roots = 0; int bdf, max; > Marc > > On Mon, 2011-01-17 at 14:47 -0500, Kevin O'Connor wrote: > > > On Mon, Jan 17, 2011 at 07:35:25PM +0100, Marc Bertens wrote: > > > Hmmm, not completely true i'm afraid. When booting a cold systen it will > > > not come up. > > > When i switch to my fallback rom it boots, now i switch back to the > > > image that was not > > > booting and now it boots just fine. > > > > > > So i was a little premature with my earlier mail. > > > > > > I added the boot log in pastebin http://pastebin.com/g83qwpnj > > > > That log shows SeaBIOS succesfully booting. Do you have a log where > > seabios fails? > > > > -Kevin > >

2 1

Re: [SeaBIOS] Question about linker building seabios
by Kevin O'Connor 17 Jan '11

17 Jan '11

On Sun, Jan 16, 2011 at 09:38:37PM +0100, Marc Bertens wrote: > Kevin, > > Finally here is the patch for Kconfig build system for SeaBIOS, the > patch exists out of two files; > 1. kconfig-for-seabios-patch.1.diff this is the part where the new > files are added. > 2. kconfig-for-seabios-patch.2.diff this is the part with the > changes to the existing files. Thanks Marc. Your patch was too large for the mailing list. Can you put future versions online somewhere or send compressed? > I hope that you agree with the changes :-) and that the kconfig will > here to stay.... > > I loaned the kconfig build system from the coreboot project, maybe there > are some references there what i missed. [...] > +++ b/src/configh.h > @@ -0,0 +1,248 @@ > +/* > + * This file is part of the seabios project. > + * > + * Copyright (C) 2011 Marc Bertens <mbertens(a)xs4all.nl> > + * Copyright (C) 2008-2010 Kevin O'Connor <kevin(a)koconnor.net> > + * > + * This program is free software; you can redistribute it and/or modify > + * it under the terms of the GNU General Public License as published by > + * the Free Software Foundation; version 2 of the License. [...] I really don't like these big copyright banners. I don't see much point in copyrighting a header file. SeaBIOS is LGPLv3, and all core files must use that copyright. This doesn't apply to non-core files copied from other projects, so doesn't need to be true for tools/kconfig. Also, your first patch modifies seabios, but I thought you were going to do that in patch2? I don't see a reason to have old way and new way in parallel - lets just go right to the kconfig way. The way you've introduced configh.h, configu.h, and configk.h in addition to the existing config.h is confusing. [...] > --- a/tools/kconfig/Makefile > +++ b/tools/kconfig/Makefile > @@ -225,7 +225,7 @@ endif > $(objk)/gconf.o: $(objk)/.tmp_gtkcheck > > ifeq ($(gconf-target),1) > --include $(objk)/.tmp_gtkcheck > +include $(objk)/.tmp_gtkcheck > > # GTK needs some extra effort, too... > $(objk)/.tmp_gtkcheck: > @@ -250,23 +250,23 @@ endif > > # --- UNUSED, ignore ---------------------------------------------------------- > ifdef UNUSED > -$(obj)/zconf.tab.o: $(obj)/lex.zconf.c $(obj)/zconf.hash.c > +$(obj)/zconf.tab.o: $(srck)/lex.zconf.c $(srck)/zconf.hash.c Can you explain what this does? -Kevin

2 4

Re: [SeaBIOS] Question about linker building seabios
by Kevin O'Connor 17 Jan '11

17 Jan '11

On Sun, Jan 16, 2011 at 09:38:37PM +0100, Marc Bertens wrote: > I have some problems today testing the patch, i checked out the lastest > from git, and found out > that the system was not booting any more. I followed the bisect > procedure of git and it told me > that the commit below is the problem. I tested the kconfig with the > version before this one, and it > worked fine. > > commit d08eb9c968e519a0b1ba63702acb2115ad536318 > Author: Kevin O'Connor <kevin(a)koconnor.net> > Date: Mon Jan 10 00:48:45 2011 -0500 > > Add ability to track PCI paths and add to build_pci_path(). > > Improve device path descriptions of devices on PCI buses. That's odd. Can you provide the output of seabios (prior to your patches) with the debug level set to 8? -Kevin

2 3

[PATCHv3] support T13 EDD3.0 spec
by Gleb Natapov 16 Jan '11

16 Jan '11

Some guests (such as Linux) expect BIOS to behave according to T13 EDD3.0 spec. T13 spec is much better then Phoenix since it provides more information about interface and device paths. This patch adds support for the spec. If guest provides buffer with enough space for T13 EDD info return EDD according to T13 spec otherwise use Phoenix one. Signed-off-by: Gleb Natapov <gleb(a)redhat.com> diff --git a/src/disk.c b/src/disk.c index f7bfe9c..8f7c61f 100644 --- a/src/disk.c +++ b/src/disk.c @@ -503,6 +503,7 @@ static void disk_1348(struct bregs *regs, struct drive_s *drive_g) { u16 size = GET_INT13DPT(regs, size); + u16 t13 = size == 74; // Buffer is too small if (size < 26) { @@ -553,8 +554,9 @@ disk_1348(struct bregs *regs, struct drive_s *drive_g) // EDD 2.x int bdf; - u16 iobase1; - u64 device_path; + u16 iobase1 = 0; + u64 device_path = 0; + u8 channel = 0; SET_INT13DPT(regs, size, 30); if (type == DTYPE_ATA || type == DTYPE_ATAPI) { u16 ebda_seg = get_ebda_seg(); @@ -573,6 +575,7 @@ disk_1348(struct bregs *regs, struct drive_s *drive_g) iobase1 = GET_GLOBALFLAT(chan_gf->iobase1); bdf = GET_GLOBALFLAT(chan_gf->pci_bdf); device_path = slave; + channel = GET_GLOBALFLAT(chan_gf->chanid); u16 options = 0; if (type == DTYPE_ATA) { @@ -613,8 +616,6 @@ disk_1348(struct bregs *regs, struct drive_s *drive_g) SET_INT13DPT(regs, dpte_segment, 0); SET_INT13DPT(regs, dpte_offset, 0); bdf = GET_GLOBAL(drive_g->cntl_id); - device_path = 0; - iobase1 = 0; } if (size < 66) { @@ -624,7 +625,7 @@ disk_1348(struct bregs *regs, struct drive_s *drive_g) // EDD 3.x SET_INT13DPT(regs, key, 0xbedd); - SET_INT13DPT(regs, dpi_length, 36); + SET_INT13DPT(regs, dpi_length, t13 ? 44 : 36); SET_INT13DPT(regs, reserved1, 0); SET_INT13DPT(regs, reserved2, 0); @@ -632,17 +633,20 @@ disk_1348(struct bregs *regs, struct drive_s *drive_g) SET_INT13DPT(regs, host_bus[0], 'P'); SET_INT13DPT(regs, host_bus[1], 'C'); SET_INT13DPT(regs, host_bus[2], 'I'); - SET_INT13DPT(regs, host_bus[3], 0); + SET_INT13DPT(regs, host_bus[3], ' '); u32 path = (pci_bdf_to_bus(bdf) | (pci_bdf_to_dev(bdf) << 8) | (pci_bdf_to_fn(bdf) << 16)); + if (t13) + path |= channel << 24; + SET_INT13DPT(regs, iface_path, path); } else { // ISA SET_INT13DPT(regs, host_bus[0], 'I'); SET_INT13DPT(regs, host_bus[1], 'S'); SET_INT13DPT(regs, host_bus[2], 'A'); - SET_INT13DPT(regs, host_bus[3], 0); + SET_INT13DPT(regs, host_bus[3], ' '); SET_INT13DPT(regs, iface_path, iobase1); } @@ -651,22 +655,30 @@ disk_1348(struct bregs *regs, struct drive_s *drive_g) SET_INT13DPT(regs, iface_type[0], 'A'); SET_INT13DPT(regs, iface_type[1], 'T'); SET_INT13DPT(regs, iface_type[2], 'A'); - SET_INT13DPT(regs, iface_type[3], 0); + SET_INT13DPT(regs, iface_type[3], ' '); } else { SET_INT13DPT(regs, iface_type[0], 'S'); SET_INT13DPT(regs, iface_type[1], 'C'); SET_INT13DPT(regs, iface_type[2], 'S'); SET_INT13DPT(regs, iface_type[3], 'I'); } - SET_INT13DPT(regs, iface_type[4], 0); - SET_INT13DPT(regs, iface_type[5], 0); - SET_INT13DPT(regs, iface_type[6], 0); - SET_INT13DPT(regs, iface_type[7], 0); + SET_INT13DPT(regs, iface_type[4], ' '); + SET_INT13DPT(regs, iface_type[5], ' '); + SET_INT13DPT(regs, iface_type[6], ' '); + SET_INT13DPT(regs, iface_type[7], ' '); + + if (t13) { + SET_INT13DPT(regs, t13.device_path[0], device_path); + SET_INT13DPT(regs, t13.device_path[1], 0); - SET_INT13DPT(regs, device_path, device_path); + SET_INT13DPT(regs, t13.checksum + , -checksum_far(regs->ds, (void*)(regs->si+30), 43)); + } else { + SET_INT13DPT(regs, phoenix.device_path, device_path); - SET_INT13DPT(regs, checksum - , -checksum_far(regs->ds, (void*)(regs->si+30), 35)); + SET_INT13DPT(regs, phoenix.checksum + , -checksum_far(regs->ds, (void*)(regs->si+30), 35)); + } disk_ret(regs, DISK_RET_SUCCESS); } diff --git a/src/disk.h b/src/disk.h index f31de73..10a0051 100644 --- a/src/disk.h +++ b/src/disk.h @@ -63,9 +63,18 @@ struct int13dpt_s { u8 host_bus[4]; u8 iface_type[8]; u64 iface_path; - u64 device_path; - u8 reserved3; - u8 checksum; + union { + struct { + u64 device_path; + u8 reserved3; + u8 checksum; + } phoenix; + struct { + u64 device_path[2]; + u8 reserved3; + u8 checksum; + } t13; + }; } PACKED; #define GET_INT13DPT(regs,var) \ -- Gleb.

4 23

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

SeaBIOS