From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Mar 22 20:40:18 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CD6A516A5A7 for ; Wed, 22 Mar 2006 20:40:18 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2FCC643D4C for ; Wed, 22 Mar 2006 20:40:18 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k2MKeIkU031881 for ; Wed, 22 Mar 2006 20:40:18 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k2MKeHCS031880; Wed, 22 Mar 2006 20:40:17 GMT (envelope-from gnats) Resent-Date: Wed, 22 Mar 2006 20:40:17 GMT Resent-Message-Id: <200603222040.k2MKeHCS031880@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Juergen Lock Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 910DA16A401 for ; Wed, 22 Mar 2006 20:38:02 +0000 (UTC) (envelope-from nox@saturn.kn-bremen.de) Received: from gwyn.kn-bremen.de (gwyn.kn-bremen.de [212.63.36.242]) by mx1.FreeBSD.org (Postfix) with ESMTP id D56B743D46 for ; Wed, 22 Mar 2006 20:38:01 +0000 (GMT) (envelope-from nox@saturn.kn-bremen.de) Received: from gwyn.kn-bremen.de (gwyn [127.0.0.1]) by gwyn.kn-bremen.de (8.13.4/8.13.4/Debian-3) with ESMTP id k2MKbxwp019952 for ; Wed, 22 Mar 2006 21:37:59 +0100 Received: from saturn.kn-bremen.de (uucp@localhost) by gwyn.kn-bremen.de (8.13.4/8.13.4/Submit) with UUCP id k2MKbxIG019950 for FreeBSD-gnats-submit@freebsd.org; Wed, 22 Mar 2006 21:37:59 +0100 Received: from saturn.kn-bremen.de (nox@localhost [127.0.0.1]) by saturn.kn-bremen.de (8.13.3/8.13.1) with ESMTP id k2MKZvgs015088 for ; Wed, 22 Mar 2006 21:35:57 +0100 (CET) (envelope-from nox@saturn.kn-bremen.de) Received: (from nox@localhost) by saturn.kn-bremen.de (8.13.3/8.13.1/Submit) id k2MKZvHB015087; Wed, 22 Mar 2006 21:35:57 +0100 (CET) (envelope-from nox) Message-Id: <200603222035.k2MKZvHB015087@saturn.kn-bremen.de> Date: Wed, 22 Mar 2006 21:35:57 +0100 (CET) From: Juergen Lock To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/94842: small emulators/qemu update X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Juergen Lock List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Mar 2006 20:40:18 -0000 >Number: 94842 >Category: ports >Synopsis: small emulators/qemu update >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Wed Mar 22 20:40:17 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Juergen Lock >Release: FreeBSD 5.5-PRERELEASE i386 >Organization: me? organized?? >Environment: System: FreeBSD saturn 5.5-PRERELEASE FreeBSD 5.5-PRERELEASE #0: Fri Mar 17 04:37:54 CET 2006 nox@saturn:/usr/obj/usr/home/nox/src-r5/src/sys/NEPTUNu i386 >Description: Lonnie sent me updates to 2 of his usb fixes, so i'd like to update the port: >How-To-Repeat: n/a >Fix: Index: Makefile =================================================================== RCS file: /home/ncvs/ports/emulators/qemu/Makefile,v retrieving revision 1.46 diff -u -r1.46 Makefile --- Makefile 18 Mar 2006 21:23:42 -0000 1.46 +++ Makefile 22 Mar 2006 20:13:18 -0000 @@ -7,7 +7,7 @@ PORTNAME= qemu PORTVERSION= 0.8.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= emulators MASTER_SITES= http://www.qemu.org/:release \ http://people.fruitsalad.org/nox/qemu/:snapshot \ Index: files/patch-usb-hchalt =================================================================== RCS file: /home/ncvs/ports/emulators/qemu/files/patch-usb-hchalt,v retrieving revision 1.1 diff -u -r1.1 patch-usb-hchalt --- files/patch-usb-hchalt 18 Mar 2006 21:23:42 -0000 1.1 +++ files/patch-usb-hchalt 18 Mar 2006 05:49:18 -0000 @@ -1,5 +1,13 @@ Index: qemu/hw/usb-uhci.c -@@ -527,6 +532,8 @@ +@@ -174,6 +177,7 @@ + if ((val & UHCI_CMD_RS) && !(s->cmd & UHCI_CMD_RS)) { + /* start frame processing */ + qemu_mod_timer(s->frame_timer, qemu_get_clock(vm_clock)); ++ s->status &= ~UHCI_STS_HCHALTED; + } + if (val & UHCI_CMD_GRESET) { + UHCIPort *port; +@@ -528,6 +534,8 @@ if (!(s->cmd & UHCI_CMD_RS)) { qemu_del_timer(s->frame_timer); Index: files/patch-usb-hubfixups =================================================================== RCS file: /home/ncvs/ports/emulators/qemu/files/patch-usb-hubfixups,v retrieving revision 1.1 diff -u -r1.1 patch-usb-hubfixups --- files/patch-usb-hubfixups 18 Mar 2006 21:23:42 -0000 1.1 +++ files/patch-usb-hubfixups 21 Mar 2006 04:47:03 -0000 @@ -25,18 +25,18 @@ case DeviceOutRequest | USB_REQ_SET_FEATURE: if (value == USB_DEVICE_REMOTE_WAKEUP) { dev->remote_wakeup = 1; -@@ -408,6 +414,11 @@ - case USB_DT_DEVICE: - memcpy(data, qemu_hub_dev_descriptor, - sizeof(qemu_hub_dev_descriptor)); +@@ -413,6 +419,11 @@ + case USB_DT_CONFIG: + memcpy(data, qemu_hub_config_descriptor, + sizeof(qemu_hub_config_descriptor)); + + /* status change endpoint size based on number + * of ports */ + data[22] = (s->nb_ports + 1 + 7) / 8; + - ret = sizeof(qemu_hub_dev_descriptor); + ret = sizeof(qemu_hub_config_descriptor); break; - case USB_DT_CONFIG: + case USB_DT_STRING: @@ -558,11 +569,29 @@ } break; @@ -85,3 +85,12 @@ status = 0; for(i = 0; i < s->nb_ports; i++) { port = &s->ports[i]; +@@ -598,7 +630,7 @@ + } + ret = n; + } else { +- ret = 0; ++ ret = USB_RET_NAK; /* usb_20 11.12.1 */ + } + } else { + goto fail; >Release-Note: >Audit-Trail: >Unformatted: