[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

ports/94842: small emulators/qemu update



>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_(_at_)_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:
_______________________________________________
freebsd-ports-bugs_(_at_)_freebsd_(_dot_)_org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-ports-bugs
To unsubscribe, send any mail to "freebsd-ports-bugs-unsubscribe_(_at_)_freebsd_(_dot_)_org"


Visit your host, monkey.org