SeaBIOS March 2012

seabios@seabios.org

31 participants
85 discussions

by Kevin O'Connor

On Tue, Mar 13, 2012 at 06:44:19PM +0900, Daniel Castro wrote: > Hello, > > Sorry to bring this again, but I am still struggling with 16 bit disk operation. > > This time I have a simpler question. > > When I do container_of(...) I get pointer to 0xd630. > The address when I created the drive struct is 0x000fd630. > What do I need to do to be able to use the return of container_of in 16bit code? When in "segmented" mode (both 16bit mode and 32bit segmented mode) the processor does not have a uniform view of memory. This is quite complex and painful to work with, so basically no modern systems use it anymore. For compatibility, seabios must still support 16bit mode though. This means that when it is in segmented mode it has a different view of memory than the init code (which runs in regular 32bit flat mode). So, the following code: u8 myglobal VAR16VISIBLE; ... dprintf(1, "myglobal addr = %p\n", &myglobal); Will show two different results - it prints 0xf1234 in 32bit flat mode (it's a variable in the f-segment). In 16bit mode it shows up as 0x1234 - the build arranges for this in order to keep the address within a 16bit range. To access the variable in 16bit mode, one must use GET_GLOBAL(myglobal) - this will arrange for the proper segment accessor (in this case %cs) to be used in conjunction with the variable address (eg, 0x1234) to load the proper value. However, the following code: int *myptr VAR16VISIBLE; ... myptr = malloc_fseg(16); ... dprintf(1, "myptr = %p\n", GET_GLOBAL(myptr)); The dprintf will show 0xf4567 regardless of the mode it is in. That is because the pointer is loaded up at runtime with a 32 bit flat address, and the build has no way of "fixing" that up. To access the content of the pointer, one would use the GET_GLOBALFLAT() macro. To make things slightly more complex, a *drive_g pointer returned from block.c:getDrive() makes the conversion from GLOBALFLAT to GLOBAL (via the GLOBALFLAT2GLOBAL macro. So, if you're working with drive_g pointers, you should just use GET_GLOBAL. This, BTW, is the reason for the "_g" and "_gf" sufixes found in places through the code - they're identifiers for pointers that are global vs globalflat. Also, be aware that *every* pointer access (that isn't pointing to a variable on the stack) must be wrapped in a macro. Failure to do this will result in random data being read. As an example of this, to read the integer pointed to by the global variable "myptr" above, one would need to run GET_GLOBALFLAT(*GET_GLOBAL(myptr)) - one macro to extract the global variable and the other macro to extract the data pointed to by the global variable. So, basically, pointers have to be accessed the correct way in order for the system to work. I know this is complex, but it's just the reality of programming in segmented mode. This complexity has nothing to do with container_of - that macro works the same way regardless of the mode. -Kevin

8 years, 4 months

Re: [SeaBIOS] [PATCH 0/2] Implement VBE function 15h

by Kevin O'Connor

On Mon, Mar 12, 2012 at 02:40:14PM +0000, Julian Pidancet wrote: > On Sat, Mar 10, 2012 at 7:01 PM, Kevin O'Connor <kevin(a)koconnor.net> wrote: > > On Wed, Mar 07, 2012 at 02:41:05AM +0000, Julian Pidancet wrote: > >> Implements VBE function 15h defined in the VBE/DDC standard. > >> Contains a preliminary implementation for bochsvga which returns > >> a hardcoded EDID with some generic informations. > >> > >> It seems Xorg refuses to use resolutions higher than 1024x768 if > >> the ROM doesn't return an EDID with timing informations to support > >> it. > >> > >> I think this work can be completed to add support for the Geode vga > >> ROM, as an I2C interface is probably available to extract the EDID > >> from a real monitor. > > > > I'm okay with the change, but I don't think it should be enabled in > > the upcoming SeaBIOS v1.7.0 release. Perhaps add a config setting and > > disable it by default. > > > > Also, the comment on patch 2 seems to indicate it is untested. I > > think it should be tested before committing. > > > > How about including only the first of this 2-patch set. It only adds > the 15h function stub and is a pretty low-risk change. What's the gain to having the stub present? It will always just return an error code, right? -Kevin

8 years, 4 months

[PATCH 00/19] USB improvements

by Kevin O'Connor

This series updates the USB code. This is mostly a code reorganization, though there are a couple of bug fixes (mostly for OHCI). -Kevin Kevin O'Connor (19): Batch free USB pipes on OHCI controllers. Batch free USB pipes on UHCI controllers. Batch free USB pipes on EHCI controllers. usb: Centralize pipe free list code. usb: Remove cntl->defaultpipe cache. usb: Obtain free list items in main code. usb: Introduce 'struct usbdevice_s' to describe info for a given device. usb: Push 'struct usbdevice_s' usage through to pipe allocation. usb: Build path via chain of usbdevice_s. usb: Pass usbdevice_s to alloc_async_pipe. usb: Pass 'struct usbdevice_s' into controller alloc_async functions. usb: Pass 'struct usbdevice_s' to controller alloc_intr_pipe functions. usb: Move code around in usb controller code. usb: Generalize controller alloc_async_pipe / alloc_intr_pipe code. usb: Move code around in usb.c. usb: Move EHCI tt_* fields to EHCI controller code. usb: Populate OHCI endpoint descriptor info at pipe allocation. usb: Fix barrier() placement in OHCI interrupt schedule add. usb: Remove QH_MULT_SHIFT flag from qh.info1. src/boot.c | 25 ++-- src/boot.h | 3 +- src/usb-ehci.c | 441 +++++++++++++++++++++++++++----------------------------- src/usb-ehci.h | 8 +- src/usb-hid.c | 28 ++-- src/usb-hid.h | 6 +- src/usb-hub.c | 14 +- src/usb-hub.h | 4 +- src/usb-msc.c | 14 +- src/usb-msc.h | 6 +- src/usb-ohci.c | 323 +++++++++++++++++++++--------------------- src/usb-ohci.h | 8 +- src/usb-uhci.c | 411 +++++++++++++++++++++++++--------------------------- src/usb-uhci.h | 8 +- src/usb.c | 277 +++++++++++++++++------------------ src/usb.h | 48 ++++--- 16 files changed, 797 insertions(+), 827 deletions(-) -- 1.7.6.5

8 years, 4 months

Re: [SeaBIOS] usb-msc.c: TEST_UNIT_READY needs USB_DIR_OUT?

by Peter Stuge

Steve Goodrich wrote: > the USB/SD adapter would start enumeration, but would fail out > during TEST_UNIT_READY because the device came back with a STALL > (this via a LeCroy/CACT USB analyzer). I compared the transactions > to those done during USB enumeration/configuration in Linux, and I > noticed that the Direction bit in bmCBWFlags is *cleared* for the > TEST_UNIT_READY command in Linux, but *set* in coreboot. > > In both cases, dCBWDataTransferLength is zero. > > The USB MSC spec that I'm using states: > If [dCBWDataTransferLength] is zero, the device and the host > shall transfer no data between the CBW and the associated CSW, > and the device shall ignore the value of the Direction bit in > bmCBWFlags. > > Obviously, this device is not ignoring the Direction flag. So... > what should it be? I modified Paolo's patch (usb-msc.c, > usb_cmd_data() function) from 27 Feb 2012 to look like this: > cbw.dCBWDataTransferLength = bytes; > if ((cbw.CBWCB[0] == CDB_CMD_WRITE_10) || > (cbw.CBWCB[0] == CDB_CMD_TEST_UNIT_READY)) { > cbw.bmCBWFlags = USB_DIR_OUT; > } else { > cbw.bmCBWFlags = USB_DIR_IN; > } > cbw.bCBWLUN = 0; // XXX It would have helped to see a patch rather than only the new code. > This change allows the device to work, but: > 1. Is this the right way to do this? It's not more right or wrong than the other way around. > 2. Will this break anything else? I'm sure it will break plenty of other non-compliant USB MSC devices which also do not ignore the direction bit and require it to be 1. > 3. Are there other commands that should be set for OUT instead of IN? Hm, commands? Not sure what you mean here. The only other thing you could do is to make the code detect the STALL, clear the stall, and then try with the direction bit inverted. This will work with devices which are not too broken to support clearing the stall. This may be a subset or a superset of those with broken MSC bulk-only implementations. Lots of fun when engineers are too stupid to follow specifications. :( The behavior might actually depend on the SD card rather than the USB-to-SD converter chip. This may or may not be relevant for you to investigate. //Peter

8 years, 4 months

usb-msc.c: TEST_UNIT_READY needs USB_DIR_OUT?

by Steve Goodrich

I've been working with coreboot and SeaBIOS lately to try to get a platform working, including having boot capability using an SD-to-USB adapter. I got stuck on this last part: the USB/SD adapter would start enumeration, but would fail out during TEST_UNIT_READY because the device came back with a STALL (this via a LeCroy/CACT USB analyzer). I compared the transactions to those done during USB enumeration/configuration in Linux, and I noticed that the Direction bit in bmCBWFlags is *cleared* for the TEST_UNIT_READY command in Linux, but *set* in coreboot. In both cases, dCBWDataTransferLength is zero. The USB MSC spec that I'm using states: If [dCBWDataTransferLength] is zero, the device and the host shall transfer no data between the CBW and the associated CSW, and the device shall ignore the value of the Direction bit in bmCBWFlags. Obviously, this device is not ignoring the Direction flag. So... what should it be? I modified Paolo's patch (usb-msc.c, usb_cmd_data() function) from 27 Feb 2012 to look like this: cbw.dCBWDataTransferLength = bytes; if ((cbw.CBWCB[0] == CDB_CMD_WRITE_10) || (cbw.CBWCB[0] == CDB_CMD_TEST_UNIT_READY)) { cbw.bmCBWFlags = USB_DIR_OUT; } else { cbw.bmCBWFlags = USB_DIR_IN; } cbw.bCBWLUN = 0; // XXX This change allows the device to work, but: 1. Is this the right way to do this? 2. Will this break anything else? 3. Are there other commands that should be set for OUT instead of IN? Thanks! -- Steve G.

8 years, 4 months

New packages

by Fred .

Please upload new packages on: http://code.coreboot.org/p/seabios/downloads/

8 years, 4 months

16 Segementation help

by Daniel Castro

Hello, Sorry to bring this again, but I am still struggling with 16 bit disk operation. This time I have a simpler question. When I do container_of(...) I get pointer to 0xd630. The address when I created the drive struct is 0x000fd630. What do I need to do to be able to use the return of container_of in 16bit code? Thanks in advance and sorry for bothering so much. Daniel -- +-=====---------------------------+ | +---------------------------------+ | This space intentionally blank for notetaking. | | | Daniel Castro, | | | | Consultant/Programmer.| | | | U Andes | +-------------------------------------+

8 years, 4 months

Re: [SeaBIOS] [Qemu-devel] [PULL] Update seabios to 1.6.3.2

by Anthony Liguori

On 03/12/2012 09:48 AM, Andreas Färber wrote: > Hi Gerd, > > Am 12.03.2012 14:08, schrieb Gerd Hoffmann: >> New seabios release on the 1.6.3 stable branch -- lets update. >> Also add a Makefile + script to simplify seabios updating. > > That version was released yesterday and I don't see any PATCHes yet... > Care to share your build script first before you send a PULL? > You also forgot to mention where to pull from. ;) > > No objection to updating though. I happen to be looking to do this myself, but upon running SeaBIOS through some testing, I ran into: /home/anthony/build/qemu/x86_64-softmmu/qemu-system-x86_64 -kernel bin/vmlinuz-3.0 -initrd .tmp-3349/initramfs-3349.img.gz -append console=ttyS0 seed=38721 -drive file=.tmp-3349/disk-3349.img,if=none,snapshot=on,id=hd0 -device virtio-balloon-pci,addr=03.0 -device virtio-blk-pci,addr=04.0,drive=hd0 -nographic -nodefconfig -m 1G -no-reboot -no-hpet -device virtio-serial -chardev socket,path=.tmp-3349/channel-3349.sock,id=channel0,server,nowait -device virtserialport,chardev=channel0,name=org.libguestfs.channel.0 -nodefaults -serial stdio -enable-kvm -pidfile .tmp-3349/pidfile-3349.pid -qmp unix:.tmp-3349/qmpsock-3349.sock,server,nowait KVM internal error. Suberror: 1 emulation failure EAX=0000aa55 EBX=00000000 ECX=00000000 EDX=00000000 ESI=00000000 EDI=00000000 EBP=00000000 ESP=00006f50 EIP=0000003c EFL=00010202 [-------] CPL=0 II=0 A20=1 SMM=0 HLT=0 ES =0000 00000000 0000ffff 00009300 CS =c300 000c3000 0000ffff 00009b00 SS =0000 00000000 0000ffff 00009300 DS =0000 00000000 0000ffff 00009300 FS =0000 00000000 0000ffff 00009300 GS =0000 00000000 0000ffff 00009300 LDT=0000 00000000 0000ffff 00008200 TR =0000 00000000 0000ffff 00008b00 GDT= 000fd3a8 00000037 IDT= 00000000 000003ff CR0=00000010 CR2=00000000 CR3=00000000 CR4=00000000 DR0=0000000000000000 DR1=0000000000000000 DR2=0000000000000000 DR3=0000000000000000 DR6=00000000ffff0ff0 DR7=0000000000000400 EFER=0000000000000000 Code=00 00 7c 02 81 02 00 00 00 00 00 00 00 00 3c 00 00 00 00 00 <8c> c8 8e d8 fa fc e9 91 00 b8 16 00 ba 10 05 ef ba 11 05 ec 66 c1 e0 08 ec 66 c1 e0 08 ec ^Cqemu: terminating on signal 2 How extensively did you test the new seabios changes and are you able to recreate? My GCC is: gcc version 4.6.1 (Ubuntu/Linaro 4.6.1-9ubuntu3) Regards, Anthony Liguori > > Andreas > >> Gerd Hoffmann (2): >> Add seabios build scripts to roms/ >> Update seabios to 1.6.3.2 >> >> pc-bios/bios.bin | Bin 131072 -> 131072 bytes >> roms/Makefile | 10 ++++++++++ >> roms/config.seabios | 1 + >> roms/configure-seabios.sh | 5 +++++ >> roms/seabios | 2 +- >> 5 files changed, 17 insertions(+), 1 deletions(-) >> create mode 100644 roms/Makefile >> create mode 100644 roms/config.seabios >> create mode 100755 roms/configure-seabios.sh >

8 years, 4 months

Re: [SeaBIOS] [PATCH 08/19] usb: Push 'struct usbdevice_s' usage through to pipe allocation.

by Dave Frodin

I had to do some whitespace cleanup in order for patch 08/19 to apply cleanly. I don't have much experience in applying patches so there might be something I'm missing. Here are the changes I had to do... Subject: [PATCH] Whitespace cleanup, replace two tabs with spaces --- src/usb-msc.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/usb-msc.c b/src/usb-msc.c index e143401..62152d8 100644 --- a/src/usb-msc.c +++ b/src/usb-msc.c @@ -132,8 +132,8 @@ usb_msc_init(struct usb_pipe *pipe // Verify right kind of device if ((iface->bInterfaceSubClass != US_SC_SCSI && - iface->bInterfaceSubClass != US_SC_ATAPI_8070 && - iface->bInterfaceSubClass != US_SC_ATAPI_8020) + iface->bInterfaceSubClass != US_SC_ATAPI_8070 && + iface->bInterfaceSubClass != US_SC_ATAPI_8020) || iface->bInterfaceProtocol != US_PR_BULK) { dprintf(1, "Unsupported MSC USB device (subclass=%02x proto=%02x)\n" , iface->bInterfaceSubClass, iface->bInterfaceProtocol); -- 1.7.9 dave ----- Original Message ----- > From: "Kevin O'Connor" <kevin(a)koconnor.net> > To: seabios(a)seabios.org > Sent: Saturday, March 10, 2012 7:44:46 PM > Subject: [SeaBIOS] [PATCH 08/19] usb: Push 'struct usbdevice_s' usage through to pipe allocation. > > Pass the usbdevice_s info to device configuration and allocation > code. > > Signed-off-by: Kevin O'Connor <kevin(a)koconnor.net> > --- > src/usb-hid.c | 28 +++++++++++++++------------- > src/usb-hid.h | 6 ++---- > src/usb-hub.c | 8 ++++---- > src/usb-hub.h | 4 ++-- > src/usb-msc.c | 15 ++++++++------- > src/usb-msc.h | 6 ++---- > src/usb.c | 35 +++++++++++++++++++---------------- > src/usb.h | 13 +++++++------ > 8 files changed, 59 insertions(+), 56 deletions(-) > > diff --git a/src/usb-hid.c b/src/usb-hid.c > index 168b7fa..21363c3 100644 > --- a/src/usb-hid.c > +++ b/src/usb-hid.c > @@ -49,7 +49,8 @@ set_idle(struct usb_pipe *pipe, int ms) > #define KEYREPEATMS 33 > > static int > -usb_kbd_init(struct usb_pipe *pipe, struct usb_endpoint_descriptor > *epdesc) > +usb_kbd_init(struct usbdevice_s *usbdev > + , struct usb_endpoint_descriptor *epdesc) > { > if (! CONFIG_USB_KEYBOARD) > return -1; > @@ -61,15 +62,15 @@ usb_kbd_init(struct usb_pipe *pipe, struct > usb_endpoint_descriptor *epdesc) > return -1; > > // Enable "boot" protocol. > - int ret = set_protocol(pipe, 0); > + int ret = set_protocol(usbdev->defpipe, 0); > if (ret) > return -1; > // Periodically send reports to enable key repeat. > - ret = set_idle(pipe, KEYREPEATMS); > + ret = set_idle(usbdev->defpipe, KEYREPEATMS); > if (ret) > return -1; > > - keyboard_pipe = alloc_intr_pipe(pipe, epdesc); > + keyboard_pipe = alloc_intr_pipe(usbdev, epdesc); > if (!keyboard_pipe) > return -1; > > @@ -78,7 +79,8 @@ usb_kbd_init(struct usb_pipe *pipe, struct > usb_endpoint_descriptor *epdesc) > } > > static int > -usb_mouse_init(struct usb_pipe *pipe, struct usb_endpoint_descriptor > *epdesc) > +usb_mouse_init(struct usbdevice_s *usbdev > + , struct usb_endpoint_descriptor *epdesc) > { > if (! CONFIG_USB_MOUSE) > return -1; > @@ -90,11 +92,11 @@ usb_mouse_init(struct usb_pipe *pipe, struct > usb_endpoint_descriptor *epdesc) > return -1; > > // Enable "boot" protocol. > - int ret = set_protocol(pipe, 0); > + int ret = set_protocol(usbdev->defpipe, 0); > if (ret) > return -1; > > - mouse_pipe = alloc_intr_pipe(pipe, epdesc); > + mouse_pipe = alloc_intr_pipe(usbdev, epdesc); > if (!mouse_pipe) > return -1; > > @@ -104,29 +106,29 @@ usb_mouse_init(struct usb_pipe *pipe, struct > usb_endpoint_descriptor *epdesc) > > // Initialize a found USB HID device (if applicable). > int > -usb_hid_init(struct usb_pipe *pipe > - , struct usb_interface_descriptor *iface, int imax) > +usb_hid_init(struct usbdevice_s *usbdev) > { > if (! CONFIG_USB_KEYBOARD || ! CONFIG_USB_MOUSE) > return -1; > - dprintf(2, "usb_hid_init %p\n", pipe); > + dprintf(2, "usb_hid_init %p\n", usbdev->defpipe); > > + struct usb_interface_descriptor *iface = usbdev->iface; > if (iface->bInterfaceSubClass != USB_INTERFACE_SUBCLASS_BOOT) > // Doesn't support boot protocol. > return -1; > > // Find intr in endpoint. > struct usb_endpoint_descriptor *epdesc = findEndPointDesc( > - iface, imax, USB_ENDPOINT_XFER_INT, USB_DIR_IN); > + usbdev, USB_ENDPOINT_XFER_INT, USB_DIR_IN); > if (!epdesc) { > dprintf(1, "No usb hid intr in?\n"); > return -1; > } > > if (iface->bInterfaceProtocol == > USB_INTERFACE_PROTOCOL_KEYBOARD) > - return usb_kbd_init(pipe, epdesc); > + return usb_kbd_init(usbdev, epdesc); > if (iface->bInterfaceProtocol == USB_INTERFACE_PROTOCOL_MOUSE) > - return usb_mouse_init(pipe, epdesc); > + return usb_mouse_init(usbdev, epdesc); > return -1; > } > > diff --git a/src/usb-hid.h b/src/usb-hid.h > index 7fbcf4b..bd6445c 100644 > --- a/src/usb-hid.h > +++ b/src/usb-hid.h > @@ -2,10 +2,8 @@ > #define __USB_HID_H > > // usb-hid.c > -struct usb_interface_descriptor; > -struct usb_pipe; > -int usb_hid_init(struct usb_pipe *pipe > - , struct usb_interface_descriptor *iface, int > imax); > +struct usbdevice_s; > +int usb_hid_init(struct usbdevice_s *usbdev); > inline int usb_kbd_active(void); > inline int usb_kbd_command(int command, u8 *param); > inline int usb_mouse_active(void); > diff --git a/src/usb-hub.c b/src/usb-hub.c > index b2d9ff2..caa6a3b 100644 > --- a/src/usb-hub.c > +++ b/src/usb-hub.c > @@ -158,21 +158,21 @@ static struct usbhub_op_s HubOp = { > > // Configure a usb hub and then find devices connected to it. > int > -usb_hub_init(struct usb_pipe *pipe) > +usb_hub_init(struct usbdevice_s *usbdev) > { > ASSERT32FLAT(); > if (!CONFIG_USB_HUB) > return -1; > > struct usb_hub_descriptor desc; > - int ret = get_hub_desc(pipe, &desc); > + int ret = get_hub_desc(usbdev->defpipe, &desc); > if (ret) > return ret; > > struct usbhub_s hub; > memset(&hub, 0, sizeof(hub)); > - hub.pipe = pipe; > - hub.cntl = pipe->cntl; > + hub.pipe = usbdev->defpipe; > + hub.cntl = usbdev->defpipe->cntl; > hub.powerwait = desc.bPwrOn2PwrGood * 2; > hub.portcount = desc.bNbrPorts; > hub.op = &HubOp; > diff --git a/src/usb-hub.h b/src/usb-hub.h > index 7672028..a75cbda 100644 > --- a/src/usb-hub.h > +++ b/src/usb-hub.h > @@ -2,8 +2,8 @@ > #define __USB_HUB_H > > // usb-hub.c > -struct usb_pipe; > -int usb_hub_init(struct usb_pipe *pipe); > +struct usbdevice_s; > +int usb_hub_init(struct usbdevice_s *usbdev); > > > /**************************************************************** > diff --git a/src/usb-msc.c b/src/usb-msc.c > index e143401..dad90d6 100644 > --- a/src/usb-msc.c > +++ b/src/usb-msc.c > @@ -124,13 +124,13 @@ fail: > > // Configure a usb msc device. > int > -usb_msc_init(struct usb_pipe *pipe > - , struct usb_interface_descriptor *iface, int imax) > +usb_msc_init(struct usbdevice_s *usbdev) > { > if (!CONFIG_USB_MSC) > return -1; > > // Verify right kind of device > + struct usb_interface_descriptor *iface = usbdev->iface; > if ((iface->bInterfaceSubClass != US_SC_SCSI && > iface->bInterfaceSubClass != US_SC_ATAPI_8070 && > iface->bInterfaceSubClass != US_SC_ATAPI_8020) > @@ -151,17 +151,18 @@ usb_msc_init(struct usb_pipe *pipe > > // Find bulk in and bulk out endpoints. > struct usb_endpoint_descriptor *indesc = findEndPointDesc( > - iface, imax, USB_ENDPOINT_XFER_BULK, USB_DIR_IN); > + usbdev, USB_ENDPOINT_XFER_BULK, USB_DIR_IN); > struct usb_endpoint_descriptor *outdesc = findEndPointDesc( > - iface, imax, USB_ENDPOINT_XFER_BULK, USB_DIR_OUT); > + usbdev, USB_ENDPOINT_XFER_BULK, USB_DIR_OUT); > if (!indesc || !outdesc) > goto fail; > - udrive_g->bulkin = alloc_bulk_pipe(pipe, indesc); > - udrive_g->bulkout = alloc_bulk_pipe(pipe, outdesc); > + udrive_g->bulkin = alloc_bulk_pipe(usbdev, indesc); > + udrive_g->bulkout = alloc_bulk_pipe(usbdev, outdesc); > if (!udrive_g->bulkin || !udrive_g->bulkout) > goto fail; > > - int prio = bootprio_find_usb(pipe->cntl->pci, pipe->path); > + int prio = bootprio_find_usb(usbdev->defpipe->cntl->pci > + , usbdev->defpipe->path); > int ret = scsi_init_drive(&udrive_g->drive, "USB MSC", prio); > if (ret) > goto fail; > diff --git a/src/usb-msc.h b/src/usb-msc.h > index 12d749c..31c81b9 100644 > --- a/src/usb-msc.h > +++ b/src/usb-msc.h > @@ -4,10 +4,8 @@ > // usb-msc.c > struct disk_op_s; > int usb_cmd_data(struct disk_op_s *op, void *cdbcmd, u16 blocksize); > -struct usb_interface_descriptor; > -struct usb_pipe; > -int usb_msc_init(struct usb_pipe *pipe > - , struct usb_interface_descriptor *iface, int > imax); > +struct usbdevice_s; > +int usb_msc_init(struct usbdevice_s *usbdev); > > > /**************************************************************** > diff --git a/src/usb.c b/src/usb.c > index 81aa429..1657bf5 100644 > --- a/src/usb.c > +++ b/src/usb.c > @@ -86,19 +86,20 @@ send_control(struct usb_pipe *pipe, int dir, > const void *cmd, int cmdsize > > // Fill "pipe" endpoint info from an endpoint descriptor. > static void > -desc2pipe(struct usb_pipe *newpipe, struct usb_pipe *origpipe > +desc2pipe(struct usb_pipe *newpipe, struct usbdevice_s *usbdev > , struct usb_endpoint_descriptor *epdesc) > { > - memcpy(newpipe, origpipe, sizeof(*newpipe)); > + memcpy(newpipe, usbdev->defpipe, sizeof(*newpipe)); > newpipe->ep = epdesc->bEndpointAddress & > USB_ENDPOINT_NUMBER_MASK; > newpipe->maxpacket = epdesc->wMaxPacketSize; > } > > struct usb_pipe * > -alloc_bulk_pipe(struct usb_pipe *pipe, struct > usb_endpoint_descriptor *epdesc) > +alloc_bulk_pipe(struct usbdevice_s *usbdev > + , struct usb_endpoint_descriptor *epdesc) > { > struct usb_pipe dummy; > - desc2pipe(&dummy, pipe, epdesc); > + desc2pipe(&dummy, usbdev, epdesc); > dummy.eptype = USB_ENDPOINT_XFER_BULK; > return alloc_async_pipe(&dummy); > } > @@ -118,18 +119,19 @@ usb_send_bulk(struct usb_pipe *pipe_fl, int > dir, void *data, int datasize) > } > > struct usb_pipe * > -alloc_intr_pipe(struct usb_pipe *pipe, struct > usb_endpoint_descriptor *epdesc) > +alloc_intr_pipe(struct usbdevice_s *usbdev > + , struct usb_endpoint_descriptor *epdesc) > { > struct usb_pipe dummy; > - desc2pipe(&dummy, pipe, epdesc); > + desc2pipe(&dummy, usbdev, epdesc); > // Find the exponential period of the requested time. > int period = epdesc->bInterval; > int frameexp; > - if (pipe->speed != USB_HIGHSPEED) > + if (usbdev->speed != USB_HIGHSPEED) > frameexp = (period <= 0) ? 0 : __fls(period); > else > frameexp = (period <= 4) ? 0 : period - 4; > - switch (pipe->type) { > + switch (dummy.type) { > default: > case USB_TYPE_UHCI: > return uhci_alloc_intr_pipe(&dummy, frameexp); > @@ -161,12 +163,11 @@ usb_poll_intr(struct usb_pipe *pipe_fl, void > *data) > > // Find the first endpoing of a given type in an interface > description. > struct usb_endpoint_descriptor * > -findEndPointDesc(struct usb_interface_descriptor *iface, int imax > - , int type, int dir) > +findEndPointDesc(struct usbdevice_s *usbdev, int type, int dir) > { > - struct usb_endpoint_descriptor *epdesc = (void*)&iface[1]; > + struct usb_endpoint_descriptor *epdesc = > (void*)&usbdev->iface[1]; > for (;;) { > - if ((void*)epdesc >= (void*)iface + imax > + if ((void*)epdesc >= (void*)usbdev->iface + usbdev->imax > || epdesc->bDescriptorType == USB_DT_INTERFACE) { > return NULL; > } > @@ -345,13 +346,15 @@ configure_usb_device(struct usbdevice_s > *usbdev) > goto fail; > > // Configure driver. > - int imax = (void*)config + config->wTotalLength - (void*)iface; > + usbdev->config = config; > + usbdev->iface = iface; > + usbdev->imax = (void*)config + config->wTotalLength - > (void*)iface; > if (iface->bInterfaceClass == USB_CLASS_HUB) > - ret = usb_hub_init(pipe); > + ret = usb_hub_init(usbdev); > else if (iface->bInterfaceClass == USB_CLASS_MASS_STORAGE) > - ret = usb_msc_init(pipe, iface, imax); > + ret = usb_msc_init(usbdev); > else > - ret = usb_hid_init(pipe, iface, imax); > + ret = usb_hid_init(usbdev); > if (ret) > goto fail; > > diff --git a/src/usb.h b/src/usb.h > index ab7f559..83ccb58 100644 > --- a/src/usb.h > +++ b/src/usb.h > @@ -26,6 +26,9 @@ struct usbdevice_s { > struct usbhub_s *hub; > struct usb_pipe *defpipe; > u32 port; > + struct usb_config_descriptor *config; > + struct usb_interface_descriptor *iface; > + int imax; > u8 speed; > }; > > @@ -215,14 +218,12 @@ int send_default_control(struct usb_pipe *pipe, > const struct usb_ctrlrequest *re > , void *data); > int usb_send_bulk(struct usb_pipe *pipe, int dir, void *data, int > datasize); > void free_pipe(struct usb_pipe *pipe); > -struct usb_pipe *alloc_bulk_pipe(struct usb_pipe *pipe > +struct usb_pipe *alloc_bulk_pipe(struct usbdevice_s *usbdev > , struct usb_endpoint_descriptor > *epdesc); > -struct usb_pipe *alloc_intr_pipe(struct usb_pipe *pipe > +struct usb_pipe *alloc_intr_pipe(struct usbdevice_s *usbdev > , struct usb_endpoint_descriptor > *epdesc); > int usb_poll_intr(struct usb_pipe *pipe, void *data); > -struct usb_endpoint_descriptor *findEndPointDesc( > - struct usb_interface_descriptor *iface, int imax, int type, int > dir); > -u32 mkendpFromDesc(struct usb_pipe *pipe > - , struct usb_endpoint_descriptor *epdesc); > +struct usb_endpoint_descriptor *findEndPointDesc(struct usbdevice_s > *usbdev > + , int type, int > dir); > > #endif // usb.h > -- > 1.7.6.5 > > > _______________________________________________ > SeaBIOS mailing list > SeaBIOS(a)seabios.org > http://www.seabios.org/mailman/listinfo/seabios >

8 years, 4 months

[PATCH 0/2] Implement VBE function 15h

by Julian Pidancet

Implements VBE function 15h defined in the VBE/DDC standard. Contains a preliminary implementation for bochsvga which returns a hardcoded EDID with some generic informations. It seems Xorg refuses to use resolutions higher than 1024x768 if the ROM doesn't return an EDID with timing informations to support it. I think this work can be completed to add support for the Geode vga ROM, as an I2C interface is probably available to extract the EDID from a real monitor. Julian Pidancet (2): vgasrc: Add skeleton for VBE function 15h (VBE/DDC Standard) bochsvga: Implement vbe 15h function src/vbe.h | 5 +++ vgasrc/bochsvga.c | 88 +++++++++++++++++++++++++++++++++++++++++++++++++++++ vgasrc/bochsvga.h | 2 + vgasrc/stdvga.c | 11 ++++++ vgasrc/stdvga.h | 2 + vgasrc/vbe.c | 34 ++++++++++++++++++++ vgasrc/vgahw.h | 12 +++++++ 7 files changed, 154 insertions(+), 0 deletions(-) -- Julian Pidancet

8 years, 4 months

← Newer
1
2
3
4
5
6
7
8
9
Older →

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

SeaBIOS March 2012