Ros-diffs May 2005

ros-diffs@reactos.org

26 participants
814 discussions

by hpoussin＠svn.reactos.com

SVN maintenance: Set svn:eol-style and svn:keywords for files Set svn:ignore for directories Modified: trunk/reactos/drivers/usb/cromwell/Makefile Modified: trunk/reactos/drivers/usb/cromwell/core/buffer_simple.c Modified: trunk/reactos/drivers/usb/cromwell/core/config.c Modified: trunk/reactos/drivers/usb/cromwell/core/hcd-pci.c Modified: trunk/reactos/drivers/usb/cromwell/core/hcd.c Modified: trunk/reactos/drivers/usb/cromwell/core/hcd.h Modified: trunk/reactos/drivers/usb/cromwell/core/hub.c Modified: trunk/reactos/drivers/usb/cromwell/core/hub.h Modified: trunk/reactos/drivers/usb/cromwell/core/makefile Modified: trunk/reactos/drivers/usb/cromwell/core/makefile.crom Modified: trunk/reactos/drivers/usb/cromwell/core/message.c Modified: trunk/reactos/drivers/usb/cromwell/core/urb.c Modified: trunk/reactos/drivers/usb/cromwell/core/usb-debug.c Modified: trunk/reactos/drivers/usb/cromwell/core/usb.c Modified: trunk/reactos/drivers/usb/cromwell/core/usb.h Modified: trunk/reactos/drivers/usb/cromwell/core/usbcore.c Modified: trunk/reactos/drivers/usb/cromwell/core/usbcore.def Modified: trunk/reactos/drivers/usb/cromwell/core/usbcore.rc Modified: trunk/reactos/drivers/usb/cromwell/host/makefile Modified: trunk/reactos/drivers/usb/cromwell/host/makefile.crom Modified: trunk/reactos/drivers/usb/cromwell/host/ohci-dbg.c Modified: trunk/reactos/drivers/usb/cromwell/host/ohci-hcd.c Modified: trunk/reactos/drivers/usb/cromwell/host/ohci-hub.c Modified: trunk/reactos/drivers/usb/cromwell/host/ohci-mem.c Modified: trunk/reactos/drivers/usb/cromwell/host/ohci-pci.c Modified: trunk/reactos/drivers/usb/cromwell/host/ohci-q.c Modified: trunk/reactos/drivers/usb/cromwell/host/ohci.def Modified: trunk/reactos/drivers/usb/cromwell/host/ohci.h Modified: trunk/reactos/drivers/usb/cromwell/host/ohci.rc Modified: trunk/reactos/drivers/usb/cromwell/host/ohci_config.h Modified: trunk/reactos/drivers/usb/cromwell/host/ohci_main.c Modified: trunk/reactos/drivers/usb/cromwell/host/ohci_main.h Modified: trunk/reactos/drivers/usb/cromwell/linux/asm/bitops.h Modified: trunk/reactos/drivers/usb/cromwell/linux/bitops.h Modified: trunk/reactos/drivers/usb/cromwell/linux/boot.h Modified: trunk/reactos/drivers/usb/cromwell/linux/consts.h Modified: trunk/reactos/drivers/usb/cromwell/linux/cromwell_types.h Modified: trunk/reactos/drivers/usb/cromwell/linux/errno.h Modified: trunk/reactos/drivers/usb/cromwell/linux/linux_wrapper.h Modified: trunk/reactos/drivers/usb/cromwell/linux/list.h Modified: trunk/reactos/drivers/usb/cromwell/linux/pci_hal.c Modified: trunk/reactos/drivers/usb/cromwell/linux/pci_ids.h Modified: trunk/reactos/drivers/usb/cromwell/linux/usb.h Modified: trunk/reactos/drivers/usb/cromwell/linux/usb_ch9.h Modified: trunk/reactos/drivers/usb/cromwell/sys/BootUSB.c Modified: trunk/reactos/drivers/usb/cromwell/sys/Makefile Modified: trunk/reactos/drivers/usb/cromwell/sys/linuxwrapper.c Modified: trunk/reactos/drivers/usb/cromwell/sys/risefall.c Modified: trunk/reactos/drivers/usb/cromwell/sys/ros_wrapper.c Modified: trunk/reactos/drivers/usb/cromwell/sys/usbkey.c Modified: trunk/reactos/drivers/usb/cromwell/sys/usbwrapper.c Modified: trunk/reactos/drivers/usb/cromwell/sys/xpad.c Modified: trunk/reactos/drivers/usb/cromwell/sys/xremote.c Modified: trunk/reactos/drivers/usb/cromwell/uhci/makefile Modified: trunk/reactos/drivers/usb/cromwell/uhci/uhci.def Modified: trunk/reactos/drivers/usb/cromwell/uhci/uhci.rc Modified: trunk/reactos/drivers/usb/cromwell/uhci/uhci_config.h Modified: trunk/reactos/drivers/usb/cromwell/uhci/uhci_main.c Modified: trunk/reactos/drivers/usb/cromwell/usb_wrapper.h Property changes on: trunk/reactos/drivers/usb/cromwell ___________________________________________________________________ Name: svn:ignore + *.coff *.sym *.o *.a *.dll *.map *.tmp .*.d _____ Modified: trunk/reactos/drivers/usb/cromwell/Makefile --- trunk/reactos/drivers/usb/cromwell/Makefile 2005-05-20 21:43:57 UTC (rev 15439) +++ trunk/reactos/drivers/usb/cromwell/Makefile 2005-05-20 21:53:08 UTC (rev 15440) @@ -1,50 +1,50 @@ -# -# ReactOS USB-Cromwell Drivers -# - -PATH_TO_TOP = ../../.. - -include $(PATH_TO_TOP)/rules.mak - -DRIVERS = core host uhci - -all: $(DRIVERS) - -depends: - -implib: $(DRIVERS:%=%_implib) - -clean: $(DRIVERS:%=%_clean) - -install: $(DRIVERS:%=%_install) - -bootcd: $(DRIVERS:%=%_bootcd) - -.PHONY: all depends implib clean install bootcd - - -# -# USB DRIVERS -# -$(DRIVERS): %: - $(MAKE) -C $* - -$(DRIVERS:%=%_implib): %_implib: - $(MAKE) -C $* implib - -$(DRIVERS:%=%_clean): %_clean: - $(MAKE) -C $* clean - -$(DRIVERS:%=%_install): %_install: - $(MAKE) -C $* install - -$(DRIVERS:%=%_bootcd): %_bootcd: - $(MAKE) -C $* bootcd - -.PHONY: $(DRIVERS) $(DRIVERS:%=%_implib) $(DRIVERS:%=%_clean) $(DRIVERS:%=%_install) $(DRIVERS:%=%_bootcd) - - -etags: - find . -name "*.[ch]" -print | etags --language=c - - -# EOF +# +# ReactOS USB-Cromwell Drivers +# + +PATH_TO_TOP = ../../.. + +include $(PATH_TO_TOP)/rules.mak + +DRIVERS = core host uhci + +all: $(DRIVERS) + +depends: + +implib: $(DRIVERS:%=%_implib) + +clean: $(DRIVERS:%=%_clean) + +install: $(DRIVERS:%=%_install) + +bootcd: $(DRIVERS:%=%_bootcd) + +.PHONY: all depends implib clean install bootcd + + +# +# USB DRIVERS +# +$(DRIVERS): %: + $(MAKE) -C $* + +$(DRIVERS:%=%_implib): %_implib: + $(MAKE) -C $* implib + +$(DRIVERS:%=%_clean): %_clean: + $(MAKE) -C $* clean + +$(DRIVERS:%=%_install): %_install: + $(MAKE) -C $* install + +$(DRIVERS:%=%_bootcd): %_bootcd: + $(MAKE) -C $* bootcd + +.PHONY: $(DRIVERS) $(DRIVERS:%=%_implib) $(DRIVERS:%=%_clean) $(DRIVERS:%=%_install) $(DRIVERS:%=%_bootcd) + + +etags: + find . -name "*.[ch]" -print | etags --language=c - + +# EOF Property changes on: trunk/reactos/drivers/usb/cromwell/Makefile ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native Property changes on: trunk/reactos/drivers/usb/cromwell/core ___________________________________________________________________ Name: svn:ignore - *.coff *.a *.d *.o *.sym *.sys *.map *.tmp + *.coff *.sym *.o *.a *.dll *.map *.tmp .*.d _____ Modified: trunk/reactos/drivers/usb/cromwell/core/buffer_simple.c --- trunk/reactos/drivers/usb/cromwell/core/buffer_simple.c 2005-05-20 21:43:57 UTC (rev 15439) +++ trunk/reactos/drivers/usb/cromwell/core/buffer_simple.c 2005-05-20 21:53:08 UTC (rev 15440) @@ -1,42 +1,42 @@ -/* - * buffer_simple.c -- replacement for usb/core/buffer.c - * - * (c) Georg Acher, georg(a)acher.org - * - */ - -#include "../usb_wrapper.h" -#define __KERNEL__ -#define CONFIG_PCI -#include "hcd.h" - -/*--------------------------------------------------------------------- ---*/ -int hcd_buffer_create (struct usb_hcd *hcd) -{ - return 0; -} -/*--------------------------------------------------------------------- ---*/ -void hcd_buffer_destroy (struct usb_hcd *hcd) -{ -} -/*--------------------------------------------------------------------- ---*/ -void *hcd_buffer_alloc ( - struct usb_bus *bus, - size_t size, - int mem_flags, - dma_addr_t *dma -) -{ - return kmalloc(size,0); -} -/*--------------------------------------------------------------------- ---*/ -void hcd_buffer_free ( - struct usb_bus *bus, - size_t size, - void *addr, - dma_addr_t dma -) -{ - kfree(addr); -} - +/* + * buffer_simple.c -- replacement for usb/core/buffer.c + * + * (c) Georg Acher, georg(a)acher.org + * + */ + +#include "../usb_wrapper.h" +#define __KERNEL__ +#define CONFIG_PCI +#include "hcd.h" + +/*--------------------------------------------------------------------- ---*/ +int hcd_buffer_create (struct usb_hcd *hcd) +{ + return 0; +} +/*--------------------------------------------------------------------- ---*/ +void hcd_buffer_destroy (struct usb_hcd *hcd) +{ +} +/*--------------------------------------------------------------------- ---*/ +void *hcd_buffer_alloc ( + struct usb_bus *bus, + size_t size, + int mem_flags, + dma_addr_t *dma +) +{ + return kmalloc(size,0); +} +/*--------------------------------------------------------------------- ---*/ +void hcd_buffer_free ( + struct usb_bus *bus, + size_t size, + void *addr, + dma_addr_t dma +) +{ + kfree(addr); +} + Property changes on: trunk/reactos/drivers/usb/cromwell/core/buffer_simple.c ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native _____ Modified: trunk/reactos/drivers/usb/cromwell/core/config.c --- trunk/reactos/drivers/usb/cromwell/core/config.c 2005-05-20 21:43:57 UTC (rev 15439) +++ trunk/reactos/drivers/usb/cromwell/core/config.c 2005-05-20 21:53:08 UTC (rev 15440) @@ -1,508 +1,508 @@ -#if 0 -#include <linux/usb.h> -#include <linux/module.h> -#include <linux/init.h> -#include <linux/slab.h> -#include <asm/byteorder.h> -#else -#include "../usb_wrapper.h" -#endif - -#define USB_MAXALTSETTING 128 /* Hard limit */ -#define USB_MAXENDPOINTS 30 /* Hard limit */ - -/* these maximums are arbitrary */ -#define USB_MAXCONFIG 8 -#define USB_ALTSETTINGALLOC 4 -#define USB_MAXINTERFACES 32 - -static int usb_parse_endpoint(struct usb_host_endpoint *endpoint, unsigned char *buffer, int size) -{ - struct usb_descriptor_header *header; - unsigned char *begin; - int parsed = 0, len, numskipped; - - header = (struct usb_descriptor_header *)buffer; - - /* Everything should be fine being passed into here, but we sanity */ - /* check JIC */ - if (header->bLength > size) { - err("ran out of descriptors parsing"); - return -1; - } - - if (header->bDescriptorType != USB_DT_ENDPOINT) { - warn("unexpected descriptor 0x%X, expecting endpoint, 0x%X", - header->bDescriptorType, USB_DT_ENDPOINT); - return parsed; - } - - if (header->bLength == USB_DT_ENDPOINT_AUDIO_SIZE) - memcpy(&endpoint->desc, buffer, USB_DT_ENDPOINT_AUDIO_SIZE); - else - memcpy(&endpoint->desc, buffer, USB_DT_ENDPOINT_SIZE); - - le16_to_cpus(&endpoint->desc.wMaxPacketSize); - - buffer += header->bLength; - size -= header->bLength; - parsed += header->bLength; - - /* Skip over the rest of the Class Specific or Vendor Specific */ - /* descriptors */ - begin = buffer; - numskipped = 0; - while (size >= sizeof(struct usb_descriptor_header)) { - header = (struct usb_descriptor_header *)buffer; - - if (header->bLength < 2) { - err("invalid descriptor length of %d", header->bLength); - return -1; - } - - /* If we find another "proper" descriptor then we're done */ - if ((header->bDescriptorType == USB_DT_ENDPOINT) || - (header->bDescriptorType == USB_DT_INTERFACE) || - (header->bDescriptorType == USB_DT_CONFIG) || - (header->bDescriptorType == USB_DT_DEVICE)) - break; - - dbg("skipping descriptor 0x%X", - header->bDescriptorType); - numskipped++; - - buffer += header->bLength; - size -= header->bLength; - parsed += header->bLength; - } - if (numskipped) - dbg("skipped %d class/vendor specific endpoint descriptors", numskipped); - - /* Copy any unknown descriptors into a storage area for drivers */ - /* to later parse */ - len = (int)(buffer - begin); - if (!len) { - endpoint->extra = NULL; - endpoint->extralen = 0; - return parsed; - } - - endpoint->extra = kmalloc(len, GFP_KERNEL); - - if (!endpoint->extra) { - err("couldn't allocate memory for endpoint extra descriptors"); - endpoint->extralen = 0; - return parsed; - } - - memcpy(endpoint->extra, begin, len); - endpoint->extralen = len; - - return parsed; -} - -static int usb_parse_interface(struct usb_interface *interface, unsigned char *buffer, int size) -{ - int i, len, numskipped, retval, parsed = 0; - struct usb_descriptor_header *header; - struct usb_host_interface *ifp; - unsigned char *begin; - - interface->act_altsetting = 0; - interface->num_altsetting = 0; - interface->max_altsetting = USB_ALTSETTINGALLOC; - device_initialize(&interface->dev); - - interface->altsetting = kmalloc(sizeof(*interface->altsetting) * interface->max_altsetting, - GFP_KERNEL); - - if (!interface->altsetting) { - err("couldn't kmalloc interface->altsetting"); - return -1; - } - - while (size > 0) { - struct usb_interface_descriptor *d; - - if (interface->num_altsetting >= interface->max_altsetting) { - struct usb_host_interface *ptr; - int oldmas; - - oldmas = interface->max_altsetting; - interface->max_altsetting += USB_ALTSETTINGALLOC; - if (interface->max_altsetting > USB_MAXALTSETTING) { - warn("too many alternate settings (incr %d max %d)\n", - USB_ALTSETTINGALLOC, USB_MAXALTSETTING); - return -1; - } - - ptr = kmalloc(sizeof(*ptr) * interface->max_altsetting, GFP_KERNEL); - if (ptr == NULL) { - err("couldn't kmalloc interface->altsetting"); - return -1; - } - memcpy(ptr, interface->altsetting, sizeof(*interface->altsetting) * oldmas); - kfree(interface->altsetting); - interface->altsetting = ptr; - } - - ifp = interface->altsetting + interface->num_altsetting; - ifp->endpoint = NULL; - ifp->extra = NULL; - ifp->extralen = 0; - interface->num_altsetting++; - - memcpy(ifp, buffer, USB_DT_INTERFACE_SIZE); - - /* Skip over the interface */ - buffer += ifp->desc.bLength; - parsed += ifp->desc.bLength; - size -= ifp->desc.bLength; - - begin = buffer; - numskipped = 0; - - /* Skip over any interface, class or vendor descriptors */ - while (size >= sizeof(struct usb_descriptor_header)) { - header = (struct usb_descriptor_header *)buffer; - - if (header->bLength < 2) { - err("invalid descriptor length of %d", header->bLength); - return -1; - } - - /* If we find another "proper" descriptor then we're done */ - if ((header->bDescriptorType == USB_DT_INTERFACE) || - (header->bDescriptorType == USB_DT_ENDPOINT) || - (header->bDescriptorType == USB_DT_CONFIG) || - (header->bDescriptorType == USB_DT_DEVICE)) - break; - - numskipped++; - - buffer += header->bLength; - parsed += header->bLength; - size -= header->bLength; - } - - if (numskipped) - dbg("skipped %d class/vendor specific interface descriptors", numskipped); - - /* Copy any unknown descriptors into a storage area for */ - /* drivers to later parse */ - len = (int)(buffer - begin); - if (len) { - ifp->extra = kmalloc(len, GFP_KERNEL); - - if (!ifp->extra) { - err("couldn't allocate memory for interface extra descriptors"); - ifp->extralen = 0; - return -1; - } - memcpy(ifp->extra, begin, len); - ifp->extralen = len; - } - - /* Did we hit an unexpected descriptor? */ - header = (struct usb_descriptor_header *)buffer; - if ((size >= sizeof(struct usb_descriptor_header)) && - ((header->bDescriptorType == USB_DT_CONFIG) || - (header->bDescriptorType == USB_DT_DEVICE))) - return parsed; - - if (ifp->desc.bNumEndpoints > USB_MAXENDPOINTS) { - warn("too many endpoints"); - return -1; - } - - ifp->endpoint = (struct usb_host_endpoint *) - kmalloc(ifp->desc.bNumEndpoints * - sizeof(struct usb_host_endpoint), GFP_KERNEL); - if (!ifp->endpoint) { - err("out of memory"); - return -1; - } - - memset(ifp->endpoint, 0, ifp->desc.bNumEndpoints * - sizeof(struct usb_host_endpoint)); - - for (i = 0; i < ifp->desc.bNumEndpoints; i++) { - header = (struct usb_descriptor_header *)buffer; - - if (header->bLength > size) { - err("ran out of descriptors parsing"); - return -1; - } - - retval = usb_parse_endpoint(ifp->endpoint + i, buffer, size); - if (retval < 0) - return retval; - - buffer += retval; - parsed += retval; - size -= retval; - } - - /* We check to see if it's an alternate to this one */ - d = (struct usb_interface_descriptor *)buffer; - if (size < USB_DT_INTERFACE_SIZE - || d->bDescriptorType != USB_DT_INTERFACE - || !d->bAlternateSetting) - return parsed; - } - - return parsed; -} - -int usb_parse_configuration(struct usb_host_config *config, char *buffer) -{ - int i, retval, size; - struct usb_descriptor_header *header; - - memcpy(&config->desc, buffer, USB_DT_CONFIG_SIZE); - le16_to_cpus(&config->desc.wTotalLength); - size = config->desc.wTotalLength; - - if (config->desc.bNumInterfaces > USB_MAXINTERFACES) { - warn("too many interfaces"); - return -1; - } - - config->interface = (struct usb_interface *) - kmalloc(config->desc.bNumInterfaces * - sizeof(struct usb_interface), GFP_KERNEL); - dbg("kmalloc IF %p, numif %i", config->interface, config->desc.bNumInterfaces); - if (!config->interface) { - err("out of memory"); - return -1; - } - - memset(config->interface, 0, - config->desc.bNumInterfaces * sizeof(struct usb_interface)); - - buffer += config->desc.bLength; - size -= config->desc.bLength; - - config->extra = NULL; - config->extralen = 0; - - for (i = 0; i < config->desc.bNumInterfaces; i++) { - int numskipped, len; - char *begin; - - /* Skip over the rest of the Class Specific or Vendor */ - /* Specific descriptors */ - begin = buffer; - numskipped = 0; - while (size >= sizeof(struct usb_descriptor_header)) { - header = (struct usb_descriptor_header *)buffer; - - if ((header->bLength > size) || (header->bLength < 2)) { - err("invalid descriptor length of %d", header->bLength); - return -1; - } - - /* If we find another "proper" descriptor then we're done */ - if ((header->bDescriptorType == USB_DT_ENDPOINT) || - (header->bDescriptorType == USB_DT_INTERFACE) || - (header->bDescriptorType == USB_DT_CONFIG) || - (header->bDescriptorType == USB_DT_DEVICE)) - break; - - dbg("skipping descriptor 0x%X", header->bDescriptorType); - numskipped++; - - buffer += header->bLength; - size -= header->bLength; - } - if (numskipped) - dbg("skipped %d class/vendor specific endpoint descriptors", numskipped); - - /* Copy any unknown descriptors into a storage area for */ - /* drivers to later parse */ - len = (int)(buffer - begin); - if (len) { - if (config->extralen) { - warn("extra config descriptor"); - } else { - config->extra = kmalloc(len, GFP_KERNEL); - if (!config->extra) { - err("couldn't allocate memory for config extra descriptors"); - config->extralen = 0; - return -1; - } - - memcpy(config->extra, begin, len); - config->extralen = len; - } - } - - retval = usb_parse_interface(config->interface + i, buffer, size); - if (retval < 0) - return retval; - - buffer += retval; - size -= retval; - } - - return size; -} - -// hub-only!! ... and only exported for reset/reinit path. -// otherwise used internally on disconnect/destroy path -void usb_destroy_configuration(struct usb_device *dev) -{ - int c, i, j, k; - - if (!dev->config) - return; - - if (dev->rawdescriptors) { - for (i = 0; i < dev->descriptor.bNumConfigurations; i++) - kfree(dev->rawdescriptors[i]); - - kfree(dev->rawdescriptors); - } - - for (c = 0; c < dev->descriptor.bNumConfigurations; c++) { - struct usb_host_config *cf = &dev->config[c]; - - if (!cf->interface) - break; - - for (i = 0; i < cf->desc.bNumInterfaces; i++) { - struct usb_interface *ifp = - &cf->interface[i]; - - if (!ifp->altsetting) - break; - - for (j = 0; j < ifp->num_altsetting; j++) { - struct usb_host_interface *as = - &ifp->altsetting[j]; - - if(as->extra) { - kfree(as->extra); - } - - if (!as->endpoint) - break; - - for(k = 0; k < as->desc.bNumEndpoints; k++) { - if(as->endpoint[k].extra) { - kfree(as->endpoint[k].extra); - } - } - kfree(as->endpoint); - } - - kfree(ifp->altsetting); - } - kfree(cf->interface); - } - kfree(dev->config); -} - - -// hub-only!! ... and only in reset path, or usb_new_device() -// (used by real hubs and virtual root hubs) -int usb_get_configuration(struct usb_device *dev) -{ - int result; - unsigned int cfgno, length; - unsigned char *buffer; - unsigned char *bigbuffer; - struct usb_config_descriptor *desc; - - if (dev->descriptor.bNumConfigurations > USB_MAXCONFIG) { - warn("too many configurations"); - return -EINVAL; - } - - if (dev->descriptor.bNumConfigurations < 1) { - warn("not enough configurations"); - return -EINVAL; - } - - dev->config = (struct usb_host_config *) - kmalloc(dev->descriptor.bNumConfigurations * - sizeof(struct usb_host_config), GFP_KERNEL); - if (!dev->config) { - err("out of memory"); - return -ENOMEM; - } - memset(dev->config, 0, dev->descriptor.bNumConfigurations * - sizeof(struct usb_host_config)); - - dev->rawdescriptors = (char **)kmalloc(sizeof(char *) * - dev->descriptor.bNumConfigurations, GFP_KERNEL); - if (!dev->rawdescriptors) { - err("out of memory"); - return -ENOMEM; - } - - buffer = kmalloc(8, GFP_KERNEL); - if (!buffer) { - err("unable to allocate memory for configuration descriptors"); - return -ENOMEM; - } - desc = (struct usb_config_descriptor *)buffer; - - for (cfgno = 0; cfgno < dev->descriptor.bNumConfigurations; cfgno++) { - /* We grab the first 8 bytes so we know how long the whole */ - /* configuration is */ - result = usb_get_descriptor(dev, USB_DT_CONFIG, cfgno, buffer, 8); - if (result < 8) { - if (result < 0) - err("unable to get descriptor"); - else { - err("config descriptor too short (expected %i, got %i)", 8, result); - result = -EINVAL; - } - goto err; - } - - /* Get the full buffer */ - length = le16_to_cpu(desc->wTotalLength); - - bigbuffer = kmalloc(length, GFP_KERNEL); - if (!bigbuffer) { - err("unable to allocate memory for configuration descriptors"); - result = -ENOMEM; - goto err; - } - - /* Now that we know the length, get the whole thing */ - result = usb_get_descriptor(dev, USB_DT_CONFIG, cfgno, bigbuffer, length); - if (result < 0) { - err("couldn't get all of config descriptors"); - kfree(bigbuffer); - goto err; - } - - if (result < length) { - err("config descriptor too short (expected %i, got %i)", length, result); - result = -EINVAL; - kfree(bigbuffer); - goto err; - } - - dev->rawdescriptors[cfgno] = bigbuffer; - - result = usb_parse_configuration(&dev->config[cfgno], bigbuffer); - if (result > 0) - dbg("descriptor data left"); - else if (result < 0) { - result = -EINVAL; - goto err; - } - } - - kfree(buffer); - return 0; -err: - kfree(buffer); - dev->descriptor.bNumConfigurations = cfgno; - return result; -} - +#if 0 +#include <linux/usb.h> +#include <linux/module.h> +#include <linux/init.h> +#include <linux/slab.h> +#include <asm/byteorder.h> +#else +#include "../usb_wrapper.h" +#endif + +#define USB_MAXALTSETTING 128 /* Hard limit */ +#define USB_MAXENDPOINTS 30 /* Hard limit */ + +/* these maximums are arbitrary */ +#define USB_MAXCONFIG 8 +#define USB_ALTSETTINGALLOC 4 +#define USB_MAXINTERFACES 32 + +static int usb_parse_endpoint(struct usb_host_endpoint *endpoint, unsigned char *buffer, int size) +{ + struct usb_descriptor_header *header; + unsigned char *begin; + int parsed = 0, len, numskipped; + + header = (struct usb_descriptor_header *)buffer; + + /* Everything should be fine being passed into here, but we sanity */ + /* check JIC */ + if (header->bLength > size) { + err("ran out of descriptors parsing"); + return -1; + } + + if (header->bDescriptorType != USB_DT_ENDPOINT) { + warn("unexpected descriptor 0x%X, expecting endpoint, 0x%X", + header->bDescriptorType, USB_DT_ENDPOINT); + return parsed; + } + + if (header->bLength == USB_DT_ENDPOINT_AUDIO_SIZE) + memcpy(&endpoint->desc, buffer, USB_DT_ENDPOINT_AUDIO_SIZE); + else + memcpy(&endpoint->desc, buffer, USB_DT_ENDPOINT_SIZE); + + le16_to_cpus(&endpoint->desc.wMaxPacketSize); + + buffer += header->bLength; + size -= header->bLength; + parsed += header->bLength; + + /* Skip over the rest of the Class Specific or Vendor Specific */ + /* descriptors */ + begin = buffer; + numskipped = 0; + while (size >= sizeof(struct usb_descriptor_header)) { + header = (struct usb_descriptor_header *)buffer; + + if (header->bLength < 2) { + err("invalid descriptor length of %d", header->bLength); + return -1; + } + + /* If we find another "proper" descriptor then we're done */ + if ((header->bDescriptorType == USB_DT_ENDPOINT) || + (header->bDescriptorType == USB_DT_INTERFACE) || + (header->bDescriptorType == USB_DT_CONFIG) || + (header->bDescriptorType == USB_DT_DEVICE)) + break; + + dbg("skipping descriptor 0x%X", + header->bDescriptorType); + numskipped++; + + buffer += header->bLength; + size -= header->bLength; + parsed += header->bLength; + } + if (numskipped) + dbg("skipped %d class/vendor specific endpoint descriptors", numskipped); + + /* Copy any unknown descriptors into a storage area for drivers */ + /* to later parse */ + len = (int)(buffer - begin); + if (!len) { + endpoint->extra = NULL; + endpoint->extralen = 0; + return parsed; + } + + endpoint->extra = kmalloc(len, GFP_KERNEL); + + if (!endpoint->extra) { + err("couldn't allocate memory for endpoint extra descriptors"); + endpoint->extralen = 0; + return parsed; + } + + memcpy(endpoint->extra, begin, len); + endpoint->extralen = len; + + return parsed; +} + +static int usb_parse_interface(struct usb_interface *interface, unsigned char *buffer, int size) +{ + int i, len, numskipped, retval, parsed = 0; + struct usb_descriptor_header *header; + struct usb_host_interface *ifp; + unsigned char *begin; + + interface->act_altsetting = 0; + interface->num_altsetting = 0; + interface->max_altsetting = USB_ALTSETTINGALLOC; + device_initialize(&interface->dev); + + interface->altsetting = kmalloc(sizeof(*interface->altsetting) * interface->max_altsetting, + GFP_KERNEL); + + if (!interface->altsetting) { + err("couldn't kmalloc interface->altsetting"); + return -1; + } + + while (size > 0) { + struct usb_interface_descriptor *d; + + if (interface->num_altsetting >= interface->max_altsetting) { + struct usb_host_interface *ptr; + int oldmas; + + oldmas = interface->max_altsetting; + interface->max_altsetting += USB_ALTSETTINGALLOC; + if (interface->max_altsetting > USB_MAXALTSETTING) { + warn("too many alternate settings (incr %d max %d)\n", + USB_ALTSETTINGALLOC, USB_MAXALTSETTING); + return -1; + } + + ptr = kmalloc(sizeof(*ptr) * interface->max_altsetting, GFP_KERNEL); + if (ptr == NULL) { + err("couldn't kmalloc interface->altsetting"); + return -1; + } + memcpy(ptr, interface->altsetting, sizeof(*interface->altsetting) * oldmas); + kfree(interface->altsetting); + interface->altsetting = ptr; + } + + ifp = interface->altsetting + interface->num_altsetting; + ifp->endpoint = NULL; + ifp->extra = NULL; + ifp->extralen = 0; + interface->num_altsetting++; + + memcpy(ifp, buffer, USB_DT_INTERFACE_SIZE); + + /* Skip over the interface */ + buffer += ifp->desc.bLength; + parsed += ifp->desc.bLength; + size -= ifp->desc.bLength; + + begin = buffer; + numskipped = 0; + + /* Skip over any interface, class or vendor descriptors */ + while (size >= sizeof(struct usb_descriptor_header)) { + header = (struct usb_descriptor_header *)buffer; + + if (header->bLength < 2) { + err("invalid descriptor length of %d", header->bLength); + return -1; + } + + /* If we find another "proper" descriptor then we're done */ + if ((header->bDescriptorType == USB_DT_INTERFACE) || + (header->bDescriptorType == USB_DT_ENDPOINT) || + (header->bDescriptorType == USB_DT_CONFIG) || + (header->bDescriptorType == USB_DT_DEVICE)) + break; + + numskipped++; + + buffer += header->bLength; + parsed += header->bLength; + size -= header->bLength; + } + + if (numskipped) + dbg("skipped %d class/vendor specific interface descriptors", numskipped); + + /* Copy any unknown descriptors into a storage area for */ + /* drivers to later parse */ + len = (int)(buffer - begin); + if (len) { + ifp->extra = kmalloc(len, GFP_KERNEL); + + if (!ifp->extra) { + err("couldn't allocate memory for interface extra descriptors"); + ifp->extralen = 0; + return -1; + } + memcpy(ifp->extra, begin, len); + ifp->extralen = len; + } + + /* Did we hit an unexpected descriptor? */ + header = (struct usb_descriptor_header *)buffer; + if ((size >= sizeof(struct usb_descriptor_header)) && + ((header->bDescriptorType == USB_DT_CONFIG) || + (header->bDescriptorType == USB_DT_DEVICE))) + return parsed; + + if (ifp->desc.bNumEndpoints > USB_MAXENDPOINTS) { + warn("too many endpoints"); + return -1; + } + + ifp->endpoint = (struct usb_host_endpoint *) + kmalloc(ifp->desc.bNumEndpoints * + sizeof(struct usb_host_endpoint), GFP_KERNEL); + if (!ifp->endpoint) { + err("out of memory"); + return -1; + } + + memset(ifp->endpoint, 0, ifp->desc.bNumEndpoints * + sizeof(struct usb_host_endpoint)); + + for (i = 0; i < ifp->desc.bNumEndpoints; i++) { + header = (struct usb_descriptor_header *)buffer; + + if (header->bLength > size) { + err("ran out of descriptors parsing"); + return -1; + } + + retval = usb_parse_endpoint(ifp->endpoint + i, buffer, size); + if (retval < 0) + return retval; + + buffer += retval; + parsed += retval; + size -= retval; + } + + /* We check to see if it's an alternate to this one */ + d = (struct usb_interface_descriptor *)buffer; + if (size < USB_DT_INTERFACE_SIZE + || d->bDescriptorType != USB_DT_INTERFACE + || !d->bAlternateSetting) + return parsed; [truncated at 1000 lines; 33775 more skipped]

19 years, 4 months

[hpoussin] 15439: Modify some pci_hal funcs, fix obvious errors in code

by hpoussin＠svn.reactos.com

Modify some pci_hal funcs, fix obvious errors in code Modified: trunk/reactos/drivers/usb/cromwell/core/hcd-pci.c Modified: trunk/reactos/drivers/usb/cromwell/host/ohci_main.h Modified: trunk/reactos/drivers/usb/cromwell/linux/linux_wrapper.h Modified: trunk/reactos/drivers/usb/cromwell/linux/pci_hal.c Modified: trunk/reactos/drivers/usb/cromwell/uhci/uhci-hcd.c Modified: trunk/reactos/drivers/usb/cromwell/uhci/uhci_main.c _____ Modified: trunk/reactos/drivers/usb/cromwell/core/hcd-pci.c --- trunk/reactos/drivers/usb/cromwell/core/hcd-pci.c 2005-05-20 21:33:49 UTC (rev 15438) +++ trunk/reactos/drivers/usb/cromwell/core/hcd-pci.c 2005-05-20 21:43:57 UTC (rev 15439) @@ -122,7 +122,7 @@ dbg ("no i/o regions available"); return -EBUSY; } - base = NULL; //(void *) resource; // this isn't possible + base = (void *) (ULONG_PTR)resource.u.LowPart; } // driver->start(), later on, will transfer device from _____ Modified: trunk/reactos/drivers/usb/cromwell/host/ohci_main.h --- trunk/reactos/drivers/usb/cromwell/host/ohci_main.h 2005-05-20 21:33:49 UTC (rev 15438) +++ trunk/reactos/drivers/usb/cromwell/host/ohci_main.h 2005-05-20 21:43:57 UTC (rev 15439) @@ -31,6 +31,7 @@ ULONG InterruptLevel; PHYSICAL_ADDRESS BaseAddress; ULONG BaseAddrLength; + ULONG Flags; ULONG AdapterInterfaceType; ULONG SystemIoBusNumber; ULONG SystemIoSlotNumber; _____ Modified: trunk/reactos/drivers/usb/cromwell/linux/linux_wrapper.h --- trunk/reactos/drivers/usb/cromwell/linux/linux_wrapper.h 2005-05-20 21:33:49 UTC (rev 15438) +++ trunk/reactos/drivers/usb/cromwell/linux/linux_wrapper.h 2005-05-20 21:43:57 UTC (rev 15439) @@ -266,7 +266,7 @@ #define KERN_WARNING "WRN: " #define KERN_INFO "INF: " #define GFP_KERNEL 0 -#define GFP_ATOMIC 0 +#define GFP_ATOMIC 0x20 #define GFP_NOIO 0 #define SLAB_ATOMIC 0 #define PCI_ANY_ID (~0) @@ -406,7 +406,7 @@ #define pci_pool_alloc(a,b,c) my_pci_pool_alloc(a,b,c) -static void __inline__ *my_pci_pool_alloc(void* pool, size_t size, +static void __inline__ *my_pci_pool_alloc(void* pool, size_t size, dma_addr_t *dma_handle) { void* a; @@ -479,8 +479,8 @@ #define PCI_DMA_FROMDEVICE #define PCI_DMA_TODEVICE -#define PCI_ROM_RESOURCE 0 -#define IORESOURCE_IO 1 +#define PCI_ROM_RESOURCE 1 +#define IORESOURCE_IO CM_RESOURCE_PORT_IO #define DECLARE_WAITQUEUE(a,b) KEVENT a=0 #define init_waitqueue_head(a) my_init_waitqueue_head(a) _____ Modified: trunk/reactos/drivers/usb/cromwell/linux/pci_hal.c --- trunk/reactos/drivers/usb/cromwell/linux/pci_hal.c 2005-05-20 21:33:49 UTC (rev 15438) +++ trunk/reactos/drivers/usb/cromwell/linux/pci_hal.c 2005-05-20 21:43:57 UTC (rev 15439) @@ -39,8 +39,12 @@ // ??? static int __inline__ pci_resource_flags(struct pci_dev *dev, int x) { - DPRINT1("pci_resource_flags() called, x=0x%x\n"); - return dev->flags[x]; + POHCI_DEVICE_EXTENSION ext = (POHCI_DEVICE_EXTENSION)dev->dev_ext; + + DPRINT1("pci_resource_flags() called, x=0x%x\n", x); + + //FIXME: Take x into account + return ext->Flags; } /* @@ -79,8 +83,8 @@ */ static int __inline__ request_region(PHYSICAL_ADDRESS addr, unsigned long len, const char * d) { - DPRINT1("request_region(): addr=0x%x, len=0x%x\n", addr, len); - return 0; + DPRINT1("request_region(): addr=0x%lx, len=0x%lx\n", addr.u.LowPart, len); + return ~0; } /* @@ -108,7 +112,7 @@ */ static int __inline__ release_region(PHYSICAL_ADDRESS addr, unsigned long len) { - DPRINT1("release_region(): addr=0x%x, len=0x%x\n", addr, len); + DPRINT1("release_region(): addr=0x%lx, len=0x%lx\n", addr.u.LowPart, len); return 0; } _____ Modified: trunk/reactos/drivers/usb/cromwell/uhci/uhci-hcd.c --- trunk/reactos/drivers/usb/cromwell/uhci/uhci-hcd.c 2005-05-20 21:33:49 UTC (rev 15438) +++ trunk/reactos/drivers/usb/cromwell/uhci/uhci-hcd.c 2005-05-20 21:43:57 UTC (rev 15439) @@ -81,7 +81,7 @@ #ifdef DEBUG static int debug = 1; #else -static int debug = 0; +static int debug = 2; #endif MODULE_PARM(debug, "i"); MODULE_PARM_DESC(debug, "Debug level"); _____ Modified: trunk/reactos/drivers/usb/cromwell/uhci/uhci_main.c --- trunk/reactos/drivers/usb/cromwell/uhci/uhci_main.c 2005-05-20 21:33:49 UTC (rev 15438) +++ trunk/reactos/drivers/usb/cromwell/uhci/uhci_main.c 2005-05-20 21:43:57 UTC (rev 15439) @@ -133,7 +133,7 @@ dev = ExAllocatePoolWithTag(PagedPool, sizeof(struct pci_dev), USB_UHCI_TAG); init_wrapper(dev); - dev->irq = DeviceExtension->InterruptLevel; + dev->irq = DeviceExtension->InterruptVector; dev->dev_ext = (PVOID)DeviceExtension; dev->slot_name = ExAllocatePoolWithTag(NonPagedPool, 128, USB_UHCI_TAG); // 128 max len for slot name @@ -226,8 +226,9 @@ } else if (Descriptor->Type == CmResourceTypePort) { - DeviceExtension->BaseAddress = Descriptor->u.Memory.Start; - DeviceExtension->BaseAddrLength = Descriptor->u.Memory.Length; + DeviceExtension->BaseAddress = Descriptor->u.Port.Start; + DeviceExtension->BaseAddrLength = Descriptor->u.Port.Length; + DeviceExtension->Flags = Descriptor->Flags; DPRINT1("I/O resource: start=0x%x, length=0x%x\n", DeviceExtension->BaseAddress.u.LowPart, DeviceExtension->BaseAddrLength);

19 years, 4 months

[greatlrd] 15438: Implement same behavor for cd * as ms cmd cd *

by greatlrd＠svn.reactos.com

Implement same behavor for cd * as ms cmd cd * Left to implement is /D options for cd then it is same level as ms win2k cmd cd En.rc Fix a options error for cd it did say cd -, but it it is cd . Modified: trunk/reactos/subsys/system/cmd/En.rc Modified: trunk/reactos/subsys/system/cmd/internal.c _____ Modified: trunk/reactos/subsys/system/cmd/En.rc --- trunk/reactos/subsys/system/cmd/En.rc 2005-05-20 19:07:23 UTC (rev 15437) +++ trunk/reactos/subsys/system/cmd/En.rc 2005-05-20 21:33:49 UTC (rev 15438) @@ -42,11 +42,11 @@ STRING_CD_HELP, "Changes the current directory or displays it's name\n\n\ CHDIR [drive:][path]\n\ -CHDIR[..|-]\n\ +CHDIR[..|.]\n\ CD [drive:][path]\n\ -CD[..|-]\n\n\ +CD[..|.]\n\n\ .. parent directory\n\ - - previous directory\n\n\ + . previous directory\n\n\ Type CD drive: to display the current directory on the specified drive.\n\ Type CD without a parameter to display the current drive and directory." _____ Modified: trunk/reactos/subsys/system/cmd/internal.c --- trunk/reactos/subsys/system/cmd/internal.c 2005-05-20 19:07:23 UTC (rev 15437) +++ trunk/reactos/subsys/system/cmd/internal.c 2005-05-20 21:33:49 UTC (rev 15438) @@ -195,6 +195,15 @@ } } + + str_len = _tcslen(param); + if (str_len==1) + { + if (param[0] == _T('*')) + { + param[0] = _T('.'); + } + } dir=param;

19 years, 4 months

[chorns] 15437: Support alternate name for hooked function

by chorns＠svn.reactos.com

Support alternate name for hooked function Modified: branches/xmlbuildsystem/reactos/tools/rbuild/stubbedcomponent.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/testsupportcode.cpp _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/stubbedcomponent.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/stubbedcomponent.cpp 2005-05-20 18:15:44 UTC (rev 15436) +++ branches/xmlbuildsystem/reactos/tools/rbuild/stubbedcomponent.cpp 2005-05-20 19:07:23 UTC (rev 15437) @@ -72,13 +72,13 @@ } symbol = node.value; + strippedName = StripSymbol ( symbol ); + const XMLAttribute* att = node.GetAttribute ( "newname", false ); if ( att != NULL ) newname = att->value; else - newname = symbol; - - strippedName = StripSymbol ( symbol ); + newname = strippedName; } string _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/testsupportcode.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/testsupportcode.cpp 2005-05-20 18:15:44 UTC (rev 15436) +++ branches/xmlbuildsystem/reactos/tools/rbuild/testsupportcode.cpp 2005-05-20 19:07:23 UTC (rev 15437) @@ -63,7 +63,7 @@ buffer = buffer + sprintf ( buffer, " {\"%s\", \"%s\", NULL, NULL, NULL},\n", component.name.c_str (), - symbol.strippedName.c_str () ); + symbol.newname.c_str () ); return buffer; }

19 years, 4 months

[hbirr] 15436: - Create always the output file. If no debug section exist, do not create a rossym section.

by hbirr＠svn.reactos.com

- Create always the output file. If no debug section exist, do not create a rossym section. Modified: trunk/reactos/tools/rsym.c _____ Modified: trunk/reactos/tools/rsym.c --- trunk/reactos/tools/rsym.c 2005-05-20 15:15:19 UTC (rev 15435) +++ trunk/reactos/tools/rsym.c 2005-05-20 18:15:44 UTC (rev 15436) @@ -146,13 +146,20 @@ StabEntry = StabSymbolsBase; Count = StabSymbolsLength / sizeof(STAB_ENTRY); + *SymbolsCount = 0; + if (Count == 0) + { + /* No symbol info */ + *SymbolsBase = NULL; + return 0; + } + *SymbolsBase = malloc(Count * sizeof(ROSSYM_ENTRY)); if (NULL == *SymbolsBase) { fprintf(stderr, "Failed to allocate memory for converted .stab symbols\n"); return 1; } - *SymbolsCount = 0; LastFunctionAddress = 0; First = 1; @@ -330,13 +337,18 @@ ULONG_PTR StabFunctionStartAddress; ULONG StabFunctionStringOffset, NewStabFunctionStringOffset; + *MergedSymbolCount = 0; + if (StabSymbolsCount == 0) + { + *MergedSymbols = NULL; + return 0; + } *MergedSymbols = malloc(StabSymbolsCount * sizeof(ROSSYM_ENTRY)); if (NULL == *MergedSymbols) { fprintf(stderr, "Unable to allocate memory for merged symbols\n"); return 1; } - *MergedSymbolCount = 0; StabFunctionStartAddress = 0; StabFunctionStringOffset = 0; @@ -627,32 +639,38 @@ OutOptHeader->FileAlignment); } - RosSymFileLength = ROUND_UP(RosSymLength, OutOptHeader->FileAlignment); - memcpy(CurrentSectionHeader->Name, ".rossym", 8); /* We're lucky: string is exactly 8 bytes long */ - CurrentSectionHeader->Misc.VirtualSize = RosSymLength; - CurrentSectionHeader->VirtualAddress = OutOptHeader->SizeOfImage; - CurrentSectionHeader->SizeOfRawData = RosSymFileLength; - CurrentSectionHeader->PointerToRawData = RosSymOffset; - CurrentSectionHeader->PointerToRelocations = 0; - CurrentSectionHeader->PointerToLinenumbers = 0; - CurrentSectionHeader->NumberOfRelocations = 0; - CurrentSectionHeader->NumberOfLinenumbers = 0; - CurrentSectionHeader->Characteristics = IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_DISCARDABLE - | IMAGE_SCN_LNK_REMOVE | IMAGE_SCN_TYPE_NOLOAD; - OutOptHeader->SizeOfImage = ROUND_UP(CurrentSectionHeader->VirtualAddress + - CurrentSectionHeader->Misc.VirtualSize, + if (RosSymLength > 0) + { + RosSymFileLength = ROUND_UP(RosSymLength, OutOptHeader->FileAlignment); + memcpy(CurrentSectionHeader->Name, ".rossym", 8); /* We're lucky: string is exactly 8 bytes long */ + CurrentSectionHeader->Misc.VirtualSize = RosSymLength; + CurrentSectionHeader->VirtualAddress = OutOptHeader->SizeOfImage; + CurrentSectionHeader->SizeOfRawData = RosSymFileLength; + CurrentSectionHeader->PointerToRawData = RosSymOffset; + CurrentSectionHeader->PointerToRelocations = 0; + CurrentSectionHeader->PointerToLinenumbers = 0; + CurrentSectionHeader->NumberOfRelocations = 0; + CurrentSectionHeader->NumberOfLinenumbers = 0; + CurrentSectionHeader->Characteristics = IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_DISCARDABLE + | IMAGE_SCN_LNK_REMOVE | IMAGE_SCN_TYPE_NOLOAD; + OutOptHeader->SizeOfImage = ROUND_UP(CurrentSectionHeader->VirtualAddress + + CurrentSectionHeader->Misc.VirtualSize, OutOptHeader->SectionAlignment); - (OutFileHeader->NumberOfSections)++; + (OutFileHeader->NumberOfSections)++; - PaddedRosSym = malloc(RosSymFileLength); - if (NULL == PaddedRosSym) + PaddedRosSym = malloc(RosSymFileLength); + if (NULL == PaddedRosSym) + { + fprintf(stderr, "Failed to allocate %lu bytes for padded .rossym\n", RosSymFileLength); + return 1; + } + memcpy(PaddedRosSym, RosSymSection, RosSymLength); + memset((char *) PaddedRosSym + RosSymLength, '\0', RosSymFileLength - RosSymLength); + } + else { - fprintf(stderr, "Failed to allocate %lu bytes for padded .rossym\n", RosSymFileLength); - return 1; + PaddedRosSym = NULL; } - memcpy(PaddedRosSym, RosSymSection, RosSymLength); - memset((char *) PaddedRosSym + RosSymLength, '\0', RosSymFileLength - RosSymLength); - CheckSum = 0; for (i = 0; i < StartOfRawData / 2; i++) { @@ -666,7 +684,7 @@ { Data = (void *) ProcessedRelocs; } - else if (Section + 1 == OutFileHeader->NumberOfSections) + else if (RosSymLength > 0 && Section + 1 == OutFileHeader->NumberOfSections) { Data = (void *) PaddedRosSym; } @@ -700,7 +718,7 @@ { Data = (void *) ProcessedRelocs; } - else if (Section + 1 == OutFileHeader->NumberOfSections) + else if (RosSymLength > 0 && Section + 1 == OutFileHeader->NumberOfSections) { Data = (void *) PaddedRosSym; } @@ -719,7 +737,10 @@ } } - free(PaddedRosSym); + if (PaddedRosSym) + { + free(PaddedRosSym); + } free(OutHeader); return 0; @@ -800,13 +821,6 @@ exit(1); } - if (StabsLength == 0 || StabStringsLength == 0) - { - /* no symbol info */ - free(FileData); - return 0; - } - if (GetCoffInfo(FileData, PEFileHeader, PESectionHeaders, &CoffsLength, &CoffBase, &CoffStringsLength, &CoffStringBase)) { @@ -840,7 +854,10 @@ CoffsLength, CoffBase, CoffStringsLength, CoffStringBase, ImageBase, PEFileHeader, PESectionHeaders)) { - free(StabSymbols); + if (StabSymbols) + { + free(StabSymbols); + } free(StringBase); free(FileData); exit(1); @@ -850,43 +867,61 @@ StabSymbolsCount, StabSymbols, CoffSymbolsCount, CoffSymbols)) { - free(CoffSymbols); - free(StabSymbols); + if (CoffSymbols) + { + free(CoffSymbols); + } + if (StabSymbols) + { + free(StabSymbols); + } free(StringBase); free(FileData); exit(1); } - free(CoffSymbols); - free(StabSymbols); - - RosSymLength = sizeof(SYMBOLFILE_HEADER) + MergedSymbolsCount * sizeof(ROSSYM_ENTRY) - + StringsLength; - RosSymSection = malloc(RosSymLength); - if (NULL == RosSymSection) + if (CoffSymbols) { - free(MergedSymbols); - free(StringBase); - free(FileData); - fprintf(stderr, "Unable to allocate memory for .rossym section\n"); - exit(1); + free(CoffSymbols); } - memset(RosSymSection, '\0', RosSymLength); + if (StabSymbols) + { + free(StabSymbols); + } + if (MergedSymbolsCount == 0) + { + RosSymLength = 0; + RosSymSection = NULL; + } + else + { + RosSymLength = sizeof(SYMBOLFILE_HEADER) + MergedSymbolsCount * sizeof(ROSSYM_ENTRY) + + StringsLength; + RosSymSection = malloc(RosSymLength); + if (NULL == RosSymSection) + { + free(MergedSymbols); + free(StringBase); + free(FileData); + fprintf(stderr, "Unable to allocate memory for .rossym section\n"); + exit(1); + } + memset(RosSymSection, '\0', RosSymLength); - SymbolFileHeader = (PSYMBOLFILE_HEADER) RosSymSection; - SymbolFileHeader->SymbolsOffset = sizeof(SYMBOLFILE_HEADER); - SymbolFileHeader->SymbolsLength = MergedSymbolsCount * sizeof(ROSSYM_ENTRY); - SymbolFileHeader->StringsOffset = SymbolFileHeader->SymbolsOffset + SymbolFileHeader->SymbolsLength; - SymbolFileHeader->StringsLength = StringsLength; + SymbolFileHeader = (PSYMBOLFILE_HEADER) RosSymSection; + SymbolFileHeader->SymbolsOffset = sizeof(SYMBOLFILE_HEADER); + SymbolFileHeader->SymbolsLength = MergedSymbolsCount * sizeof(ROSSYM_ENTRY); + SymbolFileHeader->StringsOffset = SymbolFileHeader->SymbolsOffset + SymbolFileHeader->SymbolsLength; + SymbolFileHeader->StringsLength = StringsLength; - memcpy((char *) RosSymSection + SymbolFileHeader->SymbolsOffset, MergedSymbols, - SymbolFileHeader->SymbolsLength); - memcpy((char *) RosSymSection + SymbolFileHeader->StringsOffset, StringBase, - SymbolFileHeader->StringsLength); + memcpy((char *) RosSymSection + SymbolFileHeader->SymbolsOffset, MergedSymbols, + SymbolFileHeader->SymbolsLength); + memcpy((char *) RosSymSection + SymbolFileHeader->StringsOffset, StringBase, + SymbolFileHeader->StringsLength); - free(MergedSymbols); + free(MergedSymbols); + } free(StringBase); - out = fopen(path2, "wb"); if (out == NULL) { @@ -900,13 +935,19 @@ PESectionHeaders, RosSymLength, RosSymSection)) { fclose(out); - free(RosSymSection); + if (RosSymSection) + { + free(RosSymSection); + } free(FileData); exit(1); } fclose(out); - free(RosSymSection); + if (RosSymSection) + { + free(RosSymSection); + } free(FileData); return 0;

19 years, 4 months

[chorns] 15435: Don't echo executable name of test

by chorns＠svn.reactos.com

Don't echo executable name of test Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-05-20 15:12:32 UTC (rev 15434) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-05-20 15:15:19 UTC (rev 15435) @@ -1754,7 +1754,7 @@ if ( module.type == Test ) { fprintf ( fMakefile, - "\t%s\n", + "\t@%s\n", targetMacro.c_str ()); }

19 years, 4 months

[chorns] 15434: Implement 'make test'

by chorns＠svn.reactos.com

Implement 'make test' Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.h _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-05-20 14:55:15 UTC (rev 15433) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-05-20 15:12:32 UTC (rev 15434) @@ -308,6 +308,7 @@ GenerateXmlBuildFilesMacro (); ProcessModules (); GenerateInstallTarget (); + GenerateTestTarget (); GenerateDirectoryTargets (); GenerateDirectories (); UnpackWineResources (); @@ -950,6 +951,32 @@ } void +MingwBackend::GetModuleTestTargets ( + vector<string>& out ) const +{ + for ( size_t i = 0; i < ProjectNode.modules.size (); i++ ) + { + const Module& module = *ProjectNode.modules[i]; + if ( module.type == Test ) + out.push_back ( module.name ); + } +} + +void +MingwBackend::GenerateTestTarget () +{ + vector<string> vTestTargets; + GetModuleTestTargets ( vTestTargets ); + string testTargets = v2s ( vTestTargets, 5 ); + + fprintf ( fMakefile, + "test: %s\n", + testTargets.c_str () ); + fprintf ( fMakefile, + "\n" ); +} + +void MingwBackend::GenerateDirectoryTargets () { intermediateDirectory->CreateRule ( fMakefile, "" ); _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.h --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.h 2005-05-20 14:55:15 UTC (rev 15433) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.h 2005-05-20 15:12:32 UTC (rev 15434) @@ -105,6 +105,8 @@ std::string GetRegistryTargetFiles (); void OutputRegistryInstallTarget (); void GenerateInstallTarget (); + void GetModuleTestTargets ( std::vector<std::string>& out ) const; + void GenerateTestTarget (); void GenerateDirectoryTargets (); FILE* fMakefile; bool use_pch;

19 years, 4 months

[chorns] 15433: Optimize SourceFile::ReadInclude

by chorns＠svn.reactos.com

Optimize SourceFile::ReadInclude Modified: branches/xmlbuildsystem/reactos/tools/rbuild/automaticdependency.cpp _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/automaticdependency.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/automaticdependency.cpp 2005-05-20 12:55:09 UTC (rev 15432) +++ branches/xmlbuildsystem/reactos/tools/rbuild/automaticdependency.cpp 2005-05-20 14:55:15 UTC (rev 15433) @@ -85,7 +85,7 @@ bool SourceFile::ReadInclude ( string& filename, - bool& includeNext) + bool& includeNext) { while ( p < end ) { @@ -94,32 +94,45 @@ bool include = false; p++; SkipWhitespace (); - if ( strncmp ( p, "include ", 8 ) == 0 ) + if ( *p == 'i' ) { - p += 8; - includeNext = false; - include = true; - } - if ( strncmp ( p, "include_next ", 13 ) == 0 ) - { - p += 13; - includeNext = true; - include = true; - } - - if ( include ) - { - SkipWhitespace (); - if ( p < end && *p == '<' || *p == '"' ) + if ( strncmp ( p, "include ", 8 ) == 0 ) { - p++; - filename.resize ( MAX_PATH ); - int i = 0; - while ( p < end && *p != '>' && *p != '"' && *p != '\n' ) - filename[i++] = *p++; - filename.resize ( i ); - return true; + p += 8; + includeNext = false; + include = true; } + if ( strncmp ( p, "include_next ", 13 ) == 0 ) + { + p += 13; + includeNext = true; + include = true; + } + + if ( include ) + { + SkipWhitespace (); + if ( p < end ) + { + register char ch = *p; + if ( ch == '<' || ch == '"' ) + { + p++; + filename.resize ( MAX_PATH ); + int i = 0; + ch = *p; + while ( p < end && ch != '>' && ch != '"' && ch != '\n' ) + { + filename[i++] = *p; + p++; + if ( p < end ) + ch = *p; + } + filename.resize ( i ); + return true; + } + } + } } } p++; @@ -131,7 +144,7 @@ bool SourceFile::IsParentOf ( const SourceFile* parent, - const SourceFile* child ) + const SourceFile* child ) { size_t i; for ( i = 0; i < child->parents.size (); i++ )

19 years, 4 months

[greatlrd] 15432: Add new thing to cd.

by greatlrd＠svn.reactos.com

Add new thing to cd. Make cd pr* working Modified: trunk/reactos/subsys/system/cmd/internal.c _____ Modified: trunk/reactos/subsys/system/cmd/internal.c --- trunk/reactos/subsys/system/cmd/internal.c 2005-05-20 10:55:55 UTC (rev 15431) +++ trunk/reactos/subsys/system/cmd/internal.c 2005-05-20 12:55:09 UTC (rev 15432) @@ -157,6 +157,11 @@ LPTSTR dir; /* pointer to the directory to change to */ LPTSTR lpOldPath; size_t size, str_len; + WIN32_FIND_DATA FileData; + HANDLE hSearch; + DWORD dwAttrs; + BOOL fFinished = FALSE; + /*Should we better declare a variable containing _tsclen(dir) ? It's used a few times, but on the other hand paths are generally not very long*/ @@ -242,6 +247,49 @@ if (!SetCurrentDirectory (dir)) { + + hSearch = FindFirstFile(dir, &FileData); + if (hSearch == INVALID_HANDLE_VALUE) + { + ConOutFormatMessage(GetLastError()); + free (lpOldPath); + lpOldPath = NULL; + return 1; + } + + + while (!fFinished) + { + dwAttrs = GetFileAttributes(FileData.cFileName); +#ifdef _DEBUG + DebugPrintf(_T("Search found folder :%s\n"),FileData.cFileName); +#endif + if ((dwAttrs & FILE_ATTRIBUTE_DIRECTORY)) + { + FindClose(hSearch); + // change folder + if (!SetCurrentDirectory (FileData.cFileName)) + { + ConOutFormatMessage(GetLastError()); + free (lpOldPath); + lpOldPath = NULL; + return 1; + } + + + return 0; + } + + else if (!FindNextFile(hSearch, &FileData)) + { + FindClose(hSearch); + ConOutFormatMessage(GetLastError()); + free (lpOldPath); + lpOldPath = NULL; + return 1; + } + } + //ErrorMessage (GetLastError(), _T("CD")); ConOutFormatMessage(GetLastError());

19 years, 4 months

[gvg] 15431: Backport to Xen 2

by gvg＠svn.reactos.com

Backport to Xen 2 Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/xenmem.c _____ Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/xenmem.c --- branches/xen/reactos/boot/freeldr/freeldr/arch/i386/xenmem.c 2005-05-20 10:33:27 UTC (rev 15430) +++ branches/xen/reactos/boot/freeldr/freeldr/arch/i386/xenmem.c 2005-05-20 10:55:55 UTC (rev 15431) @@ -448,7 +448,11 @@ VOID XenMemInstallPageDir(PPAGE_DIRECTORY_X86 NewPageDir) { +#if 2 == XEN_VER + mmu_update_t MmuReq; +#else /* XEN_VER */ struct mmuext_op MmuExtReq; +#endif /* XEN_VER */ ULONG NewPageDirMfn; ULONG PageIndex; @@ -487,9 +491,15 @@ } /* Set the PDBR */ +#if 2 == XEN_VER + MmuReq.ptr = (NewPageDirMfn << PFN_SHIFT) | MMU_EXTENDED_COMMAND; + MmuReq.val = MMUEXT_NEW_BASEPTR; + if (0 != XEN_MMU_UPDATE(&MmuReq, 1, NULL, DOMID_SELF)) +#else /* XEN_VER */ MmuExtReq.cmd = MMUEXT_NEW_BASEPTR; MmuExtReq.mfn = NewPageDirMfn; if (0 != HYPERVISOR_mmuext_op(&MmuExtReq, 1, NULL, DOMID_SELF)) +#endif /* XEN_VER */ { printf("Failed to set new page dir\n"); XenDie();

19 years, 4 months

← Newer
1
...
25
26
27
28
29
30
31
...
82
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2005