Send commitlog mailing list submissions to
[email protected]
To subscribe or unsubscribe via the World Wide Web, visit
http://lists.openmoko.org/mailman/listinfo/commitlog
or, via email, send a message with subject or body 'help' to
[EMAIL PROTECTED]
You can reach the person managing the list at
[EMAIL PROTECTED]
When replying, please edit your Subject line so it is more specific
than "Re: Contents of commitlog digest..."
Today's Topics:
1. r1896 - in
trunk/src/target/OM-2007/artwork/icons/openmoko-standard:
22x22/stock 36x36/stock ([EMAIL PROTECTED])
2. r1897 - trunk/src/target/u-boot/patches
([EMAIL PROTECTED])
3. r1898 - trunk/src/host/qemu-neo1973 ([EMAIL PROTECTED])
4. r1899 - trunk/src/host/qemu-neo1973/hw ([EMAIL PROTECTED])
--- Begin Message ---
Author: thomas
Date: 2007-05-02 17:34:56 +0200 (Wed, 02 May 2007)
New Revision: 1896
Added:
trunk/src/target/OM-2007/artwork/icons/openmoko-standard/22x22/stock/openmoko-action-button-address-icon.png
trunk/src/target/OM-2007/artwork/icons/openmoko-standard/22x22/stock/openmoko-action-button-email-icon.png
trunk/src/target/OM-2007/artwork/icons/openmoko-standard/22x22/stock/openmoko-action-button-phone-icon.png
Removed:
trunk/src/target/OM-2007/artwork/icons/openmoko-standard/36x36/stock/openmoko-action-button-address-icon.png
trunk/src/target/OM-2007/artwork/icons/openmoko-standard/36x36/stock/openmoko-action-button-email-icon.png
trunk/src/target/OM-2007/artwork/icons/openmoko-standard/36x36/stock/openmoko-action-button-phone-icon.png
Log:
artwork: Move 22x22 icons to correct directory
Copied:
trunk/src/target/OM-2007/artwork/icons/openmoko-standard/22x22/stock/openmoko-action-button-address-icon.png
(from rev 1895,
trunk/src/target/OM-2007/artwork/icons/openmoko-standard/36x36/stock/openmoko-action-button-address-icon.png)
Copied:
trunk/src/target/OM-2007/artwork/icons/openmoko-standard/22x22/stock/openmoko-action-button-email-icon.png
(from rev 1895,
trunk/src/target/OM-2007/artwork/icons/openmoko-standard/36x36/stock/openmoko-action-button-email-icon.png)
Copied:
trunk/src/target/OM-2007/artwork/icons/openmoko-standard/22x22/stock/openmoko-action-button-phone-icon.png
(from rev 1895,
trunk/src/target/OM-2007/artwork/icons/openmoko-standard/36x36/stock/openmoko-action-button-phone-icon.png)
Deleted:
trunk/src/target/OM-2007/artwork/icons/openmoko-standard/36x36/stock/openmoko-action-button-address-icon.png
===================================================================
(Binary files differ)
Deleted:
trunk/src/target/OM-2007/artwork/icons/openmoko-standard/36x36/stock/openmoko-action-button-email-icon.png
===================================================================
(Binary files differ)
Deleted:
trunk/src/target/OM-2007/artwork/icons/openmoko-standard/36x36/stock/openmoko-action-button-phone-icon.png
===================================================================
(Binary files differ)
--- End Message ---
--- Begin Message ---
Author: laforge
Date: 2007-05-02 18:13:04 +0200 (Wed, 02 May 2007)
New Revision: 1897
Modified:
trunk/src/target/u-boot/patches/uboot-dfu.patch
Log:
* fix breakage of DFU upload (device->host pc) introduced in rev. 1803
* turn debug message into real debug() rather than printf()
Modified: trunk/src/target/u-boot/patches/uboot-dfu.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-dfu.patch 2007-05-02 15:34:56 UTC
(rev 1896)
+++ trunk/src/target/u-boot/patches/uboot-dfu.patch 2007-05-02 16:13:04 UTC
(rev 1897)
@@ -586,7 +586,7 @@
+ remain = len;
+
+ debug("copying %u bytes ", remain);
-+ memcpy(urb->buffer, ds->ptr, remain);
++ urb->buffer = ds->ptr;
+ ds->ptr += remain;
+ urb->actual_length = remain;
+
@@ -605,7 +605,7 @@
+ break;
+ }
+
-+ printf("returning len=%u\n", len);
++ debug("returning len=%u\n", len);
+ return len;
+}
+
--- End Message ---
--- Begin Message ---
Author: andrew
Date: 2007-05-03 04:46:03 +0200 (Thu, 03 May 2007)
New Revision: 1898
Modified:
trunk/src/host/qemu-neo1973/usb-linux-gadget.c
trunk/src/host/qemu-neo1973/vl.c
trunk/src/host/qemu-neo1973/vl.h
Log:
Monitor commands to handle the USB gadget functionality, various gadgetfs usage
fixes.
Modified: trunk/src/host/qemu-neo1973/usb-linux-gadget.c
===================================================================
--- trunk/src/host/qemu-neo1973/usb-linux-gadget.c 2007-05-02 16:13:04 UTC
(rev 1897)
+++ trunk/src/host/qemu-neo1973/usb-linux-gadget.c 2007-05-03 02:46:03 UTC
(rev 1898)
@@ -361,6 +361,8 @@
if (src->bDescriptorType != USB_DT_CONFIG)
goto fail;
cfg = (struct usb_config_descriptor *) src;
+ if (packet->len < cfg->wTotalLength)
+ goto fail;
if (dl + cfg->wTotalLength > sizeof(buffer))
goto fail;
cfg->bMaxPower = 0x00;
@@ -376,6 +378,8 @@
if (dl + hci->desc_len > sizeof(buffer))
goto fail;
memcpy(dst, hci->dev_desc, hci->desc_len);
+ /* HACK: report always only a single Configuration */
+ ((struct usb_device_descriptor *) dst)->bNumConfigurations = 1;
dl += hci->desc_len;
dst += hci->desc_len;
@@ -491,13 +495,13 @@
struct usb_gadgetfs_event event;
int ret, len;
- if (!s->addr)
+ if (!s->connected)
return;
ret = read(s->ep0fd, &event, sizeof(event));
if (ret < 0 && errno != EAGAIN)
fprintf(stderr, "%s: event error: %i\n", __FUNCTION__, errno);
- if (ret < sizeof(event))
+ if (ret < (int) sizeof(event))
return;
switch (event.type) {
@@ -712,6 +716,8 @@
return ret;
atexit(gadget_done);
+ hci->addr = 0;
+
qemu_register_usb_port(&hci->port, hci, USB_INDEX_HOST, gadget_attach);
return ret;
Modified: trunk/src/host/qemu-neo1973/vl.c
===================================================================
--- trunk/src/host/qemu-neo1973/vl.c 2007-05-02 16:13:04 UTC (rev 1897)
+++ trunk/src/host/qemu-neo1973/vl.c 2007-05-03 02:46:03 UTC (rev 1898)
@@ -3955,6 +3955,8 @@
static USBPort *used_usb_ports;
static USBPort *free_usb_ports;
+static USBPort *host_usb_ports;
+static USBDevice *usb_gadget;
/* ??? Maybe change this to register a hub to keep track of the topology. */
void qemu_register_usb_port(USBPort *port, void *opaque, int index,
@@ -3963,10 +3965,20 @@
port->opaque = opaque;
port->index = index;
port->attach = attach;
- port->next = free_usb_ports;
- free_usb_ports = port;
+ if (index == USB_INDEX_HOST) {
+ port->next = host_usb_ports;
+ host_usb_ports = port;
+ } else {
+ port->next = free_usb_ports;
+ free_usb_ports = port;
+ }
}
+void qemu_register_usb_gadget(USBDevice *device)
+{
+ usb_gadget = device;
+}
+
static int usb_device_add(const char *devname)
{
const char *p;
@@ -3989,8 +4001,14 @@
if (nr >= (unsigned int)nb_nics || strcmp(nd_table[nr].model, "usb"))
return -1;
dev = usb_net_init(&nd_table[nr]);
+ } else if (!strcmp(devname, "gadget")) {
+ dev = usb_gadget;
+ port = host_usb_ports;
+ if (!dev || !port)
+ return -1;
+ goto attach;
} else {
- return -1;
+ return 0;
}
if (!dev)
return -1;
@@ -4013,6 +4031,7 @@
free_usb_ports = port->next;
port->next = used_usb_ports;
used_usb_ports = port;
+attach:
usb_attach(port, dev);
return 0;
}
@@ -4025,6 +4044,14 @@
int bus_num, addr;
const char *p;
+ if (!strcmp(devname, "gadget")) {
+ port = host_usb_ports;
+ if (!port)
+ return -1;
+ usb_attach(port, NULL);
+ return 0;
+ }
+
if (!used_usb_ports)
return -1;
Modified: trunk/src/host/qemu-neo1973/vl.h
===================================================================
--- trunk/src/host/qemu-neo1973/vl.h 2007-05-02 16:13:04 UTC (rev 1897)
+++ trunk/src/host/qemu-neo1973/vl.h 2007-05-03 02:46:03 UTC (rev 1898)
@@ -1229,8 +1229,10 @@
/* usb ports of the VM */
+#define USB_INDEX_HOST -1
void qemu_register_usb_port(USBPort *port, void *opaque, int index,
usb_attachfn attach);
+void qemu_register_usb_gadget(USBDevice *device);
#define VM_USB_HUB_SIZE 8
@@ -1457,6 +1459,8 @@
#include "hw/i2c.h"
+#define unlikely(cond) __builtin_expect(cond, 0)
+
#ifdef TARGET_ARM
#include "hw/pxa.h"
#include "hw/s3c.h"
--- End Message ---
--- Begin Message ---
Author: andrew
Date: 2007-05-03 11:58:37 +0200 (Thu, 03 May 2007)
New Revision: 1899
Modified:
trunk/src/host/qemu-neo1973/hw/neo1973.c
Log:
Pass correct RAM size in kernel parameters (currently unused) - spotted by
BobOfDoom.
Modified: trunk/src/host/qemu-neo1973/hw/neo1973.c
===================================================================
--- trunk/src/host/qemu-neo1973/hw/neo1973.c 2007-05-03 02:46:03 UTC (rev
1898)
+++ trunk/src/host/qemu-neo1973/hw/neo1973.c 2007-05-03 09:58:37 UTC (rev
1899)
@@ -366,7 +366,7 @@
#if 0
cpu->env->regs[15] = S3C_SRAM_BASE;
- arm_load_kernel(ram_size, kernel_filename, kernel_cmdline,
+ arm_load_kernel(neo_ram, kernel_filename, kernel_cmdline,
initrd_filename, 0x49e, S3C_RAM_BASE);
#else
load_image("u-boot.bin",
--- End Message ---
_______________________________________________
commitlog mailing list
[email protected]
http://lists.openmoko.org/mailman/listinfo/commitlog
