[SeaBIOS] [PATCH] cleanup process_usb_op() / process_scsi_op() declarations
Commit 1e749c85 removed the definition of process_usb_op(); let's remove
the declaration too.
The same commit added process_scsi_op(). The function has no declaration
that is also not a definition, and its only call site is in the same file
as the definition. Give the function internal linkage.
Build tested.
Signed-off-by: Laszlo Ersek
---
Please keep me CC'd, I'm not subscribed. Thanks.
src/block.c |2 +-
src/usb-msc.h |1 -
2 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/src/block.c b/src/block.c
index eeebd83..ccf4ee6 100644
--- a/src/block.c
+++ b/src/block.c
@@ -276,7 +276,7 @@ map_floppy_drive(struct drive_s *drive_g)
* 16bit calling interface
/
-int
+static int
process_scsi_op(struct disk_op_s *op)
{
if (!CONFIG_USB_MSC)
diff --git a/src/usb-msc.h b/src/usb-msc.h
index a8686a3..12d749c 100644
--- a/src/usb-msc.h
+++ b/src/usb-msc.h
@@ -8,7 +8,6 @@ struct usb_interface_descriptor;
struct usb_pipe;
int usb_msc_init(struct usb_pipe *pipe
, struct usb_interface_descriptor *iface, int imax);
-int process_usb_op(struct disk_op_s *op);
/
--
1.7.1
___
SeaBIOS mailing list
SeaBIOS@seabios.org
http://www.seabios.org/mailman/listinfo/seabios
[SeaBIOS] Time for a new release?
Lots of stuff have been happening lately (namely VGA and VBE related stuff). Also some fixes. Perhaps it is time for a new release soon? ___ SeaBIOS mailing list SeaBIOS@seabios.org http://www.seabios.org/mailman/listinfo/seabios
Re: [SeaBIOS] seabios build failure in xen tree
On 02/09/12 02:28, Kevin O'Connor wrote: On Wed, Feb 08, 2012 at 11:32:10AM +0100, Christoph Egger wrote: On 02/08/12 02:18, Kevin O'Connor wrote: We can change the seabios makefile to call these scripts with an explicit $(PYTHON). Awesome! See the attached patch. That's quite odd. This looks data related instead of python related. Try running a "make clean" and then "make" in just the seabios directory. If you still see an issue, tar up the seabios "out/" directory and mail it to me. It failed the same way. I sent you the tarball offlist due its size. Looks like your version of gcc is defining sections with .rodata.__PRETTY_FUNCTION__ - which is odd as that macro isn't used in the code. Does the second attached patch fix it for you? -Kevin Both patches work for me and there are no follow-up errors. Thank you. Christoph -- ---to satisfy European Law for business letters: Advanced Micro Devices GmbH Einsteinring 24, 85689 Dornach b. Muenchen Geschaeftsfuehrer: Alberto Bozzo, Andrew Bowd Sitz: Dornach, Gemeinde Aschheim, Landkreis Muenchen Registergericht Muenchen, HRB Nr. 43632 ___ SeaBIOS mailing list SeaBIOS@seabios.org http://www.seabios.org/mailman/listinfo/seabios
[SeaBIOS] [PATCH 1/5] update seabios to latest master [feb 9th]
Signed-off-by: Gerd Hoffmann
---
pc-bios/vgabios-cirrus.bin | Bin 35840 -> 35328 bytes
roms/seabios |2 +-
2 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/pc-bios/vgabios-cirrus.bin b/pc-bios/vgabios-cirrus.bin
index
424dd0c70c4a52e1a98d8a64ebf4aa382b85d5cf..487f64be23013589487194fa82d694325fbad4cc
100644
GIT binary patch
literal 35328
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
[SeaBIOS] [PATCH 2/5] Add vgabios build scripts to roms/
Signed-off-by: Gerd Hoffmann --- roms/Makefile | 17 + roms/config.vga.cirrus|3 +++ roms/config.vga.isavga|3 +++ roms/config.vga.qxl |6 ++ roms/config.vga.stdvga|3 +++ roms/config.vga.vmware|6 ++ roms/configure-seabios.sh |5 + 7 files changed, 43 insertions(+), 0 deletions(-) create mode 100644 roms/Makefile create mode 100644 roms/config.vga.cirrus create mode 100644 roms/config.vga.isavga create mode 100644 roms/config.vga.qxl create mode 100644 roms/config.vga.stdvga create mode 100644 roms/config.vga.vmware create mode 100755 roms/configure-seabios.sh diff --git a/roms/Makefile b/roms/Makefile new file mode 100644 index 000..5c3d5f4 --- /dev/null +++ b/roms/Makefile @@ -0,0 +1,17 @@ + +targets_vgabios := vgabios-cirrus vgabios-stdvga +targets_vgabios += vgabios-vmware vgabios-qxl +#targets_vgabios += vgabios-isavga + +default: + @echo "nothing is build by default" + @echo "available build targets:" + @echo " vgabios- -- update vgabios-.bin" + @echo " vgabios-- update all vgabios binaries" + +vgabios: $(targets_vgabios) + +vgabios-%: config.vga.% + sh configure-seabios.sh $< + make -C seabios out/vgabios.bin + cp seabios/out/vgabios.bin ../pc-bios/vgabios-$*.bin diff --git a/roms/config.vga.cirrus b/roms/config.vga.cirrus new file mode 100644 index 000..c8fe582 --- /dev/null +++ b/roms/config.vga.cirrus @@ -0,0 +1,3 @@ +CONFIG_BUILD_VGABIOS=y +CONFIG_VGA_CIRRUS=y +CONFIG_VGA_PCI=y diff --git a/roms/config.vga.isavga b/roms/config.vga.isavga new file mode 100644 index 000..e55e294 --- /dev/null +++ b/roms/config.vga.isavga @@ -0,0 +1,3 @@ +CONFIG_BUILD_VGABIOS=y +CONFIG_VGA_BOCHS=y +CONFIG_VGA_PCI=n diff --git a/roms/config.vga.qxl b/roms/config.vga.qxl new file mode 100644 index 000..d393f0c --- /dev/null +++ b/roms/config.vga.qxl @@ -0,0 +1,6 @@ +CONFIG_BUILD_VGABIOS=y +CONFIG_VGA_BOCHS=y +CONFIG_VGA_PCI=y +CONFIG_OVERRIDE_PCI_ID=y +CONFIG_VGA_VID=0x1b36 +CONFIG_VGA_DID=0x0100 diff --git a/roms/config.vga.stdvga b/roms/config.vga.stdvga new file mode 100644 index 000..7d063b7 --- /dev/null +++ b/roms/config.vga.stdvga @@ -0,0 +1,3 @@ +CONFIG_BUILD_VGABIOS=y +CONFIG_VGA_BOCHS=y +CONFIG_VGA_PCI=y diff --git a/roms/config.vga.vmware b/roms/config.vga.vmware new file mode 100644 index 000..eb10427 --- /dev/null +++ b/roms/config.vga.vmware @@ -0,0 +1,6 @@ +CONFIG_BUILD_VGABIOS=y +CONFIG_VGA_BOCHS=y +CONFIG_VGA_PCI=y +CONFIG_OVERRIDE_PCI_ID=y +CONFIG_VGA_VID=0x15ad +CONFIG_VGA_DID=0x0405 diff --git a/roms/configure-seabios.sh b/roms/configure-seabios.sh new file mode 100755 index 000..98f59a2 --- /dev/null +++ b/roms/configure-seabios.sh @@ -0,0 +1,5 @@ +#!/bin/sh +config="$1" +make -C seabios clean distclean +cp "$config" seabios/.config +make -C seabios oldnoconfig -- 1.7.1 ___ SeaBIOS mailing list SeaBIOS@seabios.org http://www.seabios.org/mailman/listinfo/seabios
[SeaBIOS] [PATCH 0/5] rom build scripting, switch vgabios implementation
Hi folks, There is a vgabios sitting implementation in the seabios repository for a while. Recently it got a huge overhaul and should be on-par with the lgpl vgabios implementation. I'd like to see qemu switch to that implementation, for very simliar reasons which made us switch from bochs bios to seabios. The vgabios is written almost completely in C, thus it is easier to modify and maintain. We have a very responsitive upstream. This patch series adds some build magic to roms/, for two reasons: It simplifies updates and documents the build process. Covers seabios and vgabios for now. Anyone who is familier with the build process for other roms (ipxe, openbios, slof, ...) is welcome to add more bits there. seabios submodule is updated to latest master (mirroring @ qemu.org seems to be broken btw, had to pull from seabios.org directly), vgabios and seabios binaries are updated. Tests, comments etc, are welcome. cheers, Gerd The following changes since commit cf4dc461a4cfc3e056ee24edb26154f4d34a6278: Restore consistent formatting (2012-02-07 22:11:04 +0400) are available in the git repository at: git://git.kraxel.org/qemu bios.1 Gerd Hoffmann (5): update seabios to latest master [feb 9th] Add vgabios build scripts to roms/ Update vgabios binaries Add seabios build scripts to roms/ Update seabios binary pc-bios/bios.bin | Bin 131072 -> 131072 bytes pc-bios/vgabios-cirrus.bin | Bin 35840 -> 37376 bytes pc-bios/vgabios-qxl.bin| Bin 40448 -> 37376 bytes pc-bios/vgabios-stdvga.bin | Bin 40448 -> 37376 bytes pc-bios/vgabios-vmware.bin | Bin 40448 -> 37376 bytes roms/Makefile | 23 +++ roms/config.seabios|1 + roms/config.vga.cirrus |3 +++ roms/config.vga.isavga |3 +++ roms/config.vga.qxl|6 ++ roms/config.vga.stdvga |3 +++ roms/config.vga.vmware |6 ++ roms/configure-seabios.sh |5 + roms/seabios |2 +- 14 files changed, 51 insertions(+), 1 deletions(-) create mode 100644 roms/Makefile create mode 100644 roms/config.seabios create mode 100644 roms/config.vga.cirrus create mode 100644 roms/config.vga.isavga create mode 100644 roms/config.vga.qxl create mode 100644 roms/config.vga.stdvga create mode 100644 roms/config.vga.vmware create mode 100755 roms/configure-seabios.sh ___ SeaBIOS mailing list SeaBIOS@seabios.org http://www.seabios.org/mailman/listinfo/seabios
[SeaBIOS] [PATCH 4/5] Add seabios build scripts to roms/
Signed-off-by: Gerd Hoffmann --- roms/Makefile |6 ++ roms/config.seabios |1 + 2 files changed, 7 insertions(+), 0 deletions(-) create mode 100644 roms/config.seabios diff --git a/roms/Makefile b/roms/Makefile index 5c3d5f4..b24c728 100644 --- a/roms/Makefile +++ b/roms/Makefile @@ -8,6 +8,7 @@ default: @echo "available build targets:" @echo " vgabios- -- update vgabios-.bin" @echo " vgabios-- update all vgabios binaries" + @echo " bios -- update bios.bin (seabios)" vgabios: $(targets_vgabios) @@ -15,3 +16,8 @@ vgabios-%: config.vga.% sh configure-seabios.sh $< make -C seabios out/vgabios.bin cp seabios/out/vgabios.bin ../pc-bios/vgabios-$*.bin + +bios: config.seabios + sh configure-seabios.sh $< + make -C seabios out/bios.bin + cp seabios/out/bios.bin ../pc-bios/bios.bin diff --git a/roms/config.seabios b/roms/config.seabios new file mode 100644 index 000..c373b87 --- /dev/null +++ b/roms/config.seabios @@ -0,0 +1 @@ +# empty, default config works for us -- 1.7.1 ___ SeaBIOS mailing list SeaBIOS@seabios.org http://www.seabios.org/mailman/listinfo/seabios
Re: [SeaBIOS] [PATCH 0/3] runtime hardware detection series.
On 02/09/12 02:06, Kevin O'Connor wrote: > On Wed, Feb 08, 2012 at 05:38:56PM +0100, Gerd Hoffmann wrote: >> Hi, >> >> Next round, this time introducing a CONFIG_VGA_QEMU and doing the >> hardware detection for qemu-emulated hardware only. Also clarifies >> Kconfig (cirrus is for emulated hardware only) as side effect. > > What's the advantage of modifying the code versus just having a simple > build script? There is no real advantage, just a matter of taste. I'd prefer to have it this way, but I can do it with some build scriptease in qemu too ... cheers, Gerd ___ SeaBIOS mailing list SeaBIOS@seabios.org http://www.seabios.org/mailman/listinfo/seabios
