 @@ -1,16 +1,17 @@
-$NetBSD: patch-ac,v 1.11 2012/07/14 23:42:13 wiz Exp $
+$NetBSD: patch-ac,v 1.12 2012/07/15 08:12:42 wiz Exp $
 Improve NetBSD support. From Michael Lorenz <macallan@NetBSD.org>.
 Enable boot_vga support only if WSDISPLAYIO_GET_BUSID is defined.
 --- src/netbsd_pci.c.orig	2012-04-09 17:02:57.000000000 +0000
 +++ src/netbsd_pci.c
 @@ -1,6 +1,7 @@
  /*
   * Copyright (c) 2008 Juan Romero Pardines
   * Copyright (c) 2008 Mark Kettenis
 + * Copyright (c) 2009 Michael Lorenz
+  *
   * Permission to use, copy, modify, and distribute this software for any
   * purpose with or without fee is hereby granted, provided that the above
 @@ -20,8 +21,13 @@
  #include <sys/mman.h>
 @@ -300,30 +301,31 @@ Improve NetBSD support. From Michael Lor
 -		if (ioctl(pcifd, PCI_IOC_BDF_CFGWRITE, &io) == -1)
 +		if ((pcibus_conf_write(buses[dev->domain].fd,
 +		    (unsigned int)dev->bus, (unsigned int)dev->dev,
 +		    (unsigned int)dev->func, reg, val)) == -1)
  			return errno;
  		offset += 4;
 -		data = (char *)data + 4;
 +		data = (const char *)data + 4;
  		size -= 4;
  		*bytes_written += 4;
+ 	}
-@@ -222,10 +250,51 @@ pci_device_netbsd_write(struct pci_devic
+@@ -222,10 +250,53 @@ pci_device_netbsd_write(struct pci_devic
  	return 0;
+ }
 +#if defined(WSDISPLAYIO_GET_BUSID)
 +static int
 +pci_device_netbsd_boot_vga(struct pci_device *dev)
 +{
 +	int ret;
 +	struct wsdisplayio_bus_id busid;
 +	int fd;
++
 +	fd = open("/dev/ttyE0", O_RDONLY);
 +	if (fd == -1) {
 +		fprintf(stderr, "failed to open /dev/ttyE0: %s\n",
 +		    strerror(errno));
 +		return 0;
 +	}
 @@ -340,40 +342,41 @@ Improve NetBSD support. From Michael Lor
 +		return 0;
++
 +	if (busid.ubus.pci.domain != dev->domain)
 +		return 0;
 +	if (busid.ubus.pci.bus != dev->bus)
 +		return 0;
 +	if (busid.ubus.pci.device != dev->dev)
 +		return 0;
 +	if (busid.ubus.pci.function != dev->func)
 +		return 0;
++
 +	return 1;
 +}
 +#endif
++
  static void
  pci_system_netbsd_destroy(void)
+ {
 -	close(pcifd);
 +	int i;
++
 +	for (i = 0; i < nbuses; i++) {
 +		close(buses[i].fd);
 +	}
  	free(pci_sys);
  	pci_sys = NULL;
+ }
-@@ -233,17 +302,34 @@ pci_system_netbsd_destroy(void)
+@@ -233,17 +304,34 @@ pci_system_netbsd_destroy(void)
  static int
  pci_device_netbsd_probe(struct pci_device *device)
+ {
 -	struct pci_device_private *priv = (struct pci_device_private *)device;
 +	struct pci_device_private *priv =
 +	    (struct pci_device_private *)(void *)device;
  	struct pci_mem_region *region;
  	uint64_t reg64, size64;
  	uint32_t bar, reg, size;
 -	int bus, dev, func, err;
 +	int bus, dev, func, err, domain;
 +	domain = device->domain;
 @@ -391,48 +394,48 @@ Improve NetBSD support. From Michael Lor
 +		reg |= PCI_COMMAND_IO_ENABLE |
 +		       PCI_COMMAND_MEM_ENABLE |
 +		       PCI_COMMAND_MASTER_ENABLE;
 +		err = pci_write(domain, bus, dev, func, PCI_COMMAND_STATUS_REG,
 +				reg);
 +		if (err)
 +			return err;
 +	}
++
 +	err = pci_read(domain, bus, dev, func, PCI_BHLC_REG, &reg);
  	if (err)
  		return err;
-@@ -254,16 +340,16 @@ pci_device_netbsd_probe(struct pci_devic
+@@ -254,16 +342,16 @@ pci_device_netbsd_probe(struct pci_devic
  	region = device->regions;
  	for (bar = PCI_MAPREG_START; bar < PCI_MAPREG_END;
  	     bar += sizeof(uint32_t), region++) {
 -		err = pci_read(bus, dev, func, bar, &reg);
 +		err = pci_read(domain, bus, dev, func, bar, &reg);
  		if (err)
  			return err;
  		/* Probe the size of the region. */
 -		err = pci_write(bus, dev, func, bar, ~0);
 +		err = pci_write(domain, bus, dev, func, bar, (unsigned int)~0);
  		if (err)
  			return err;
 -		pci_read(bus, dev, func, bar, &size);
 -		pci_write(bus, dev, func, bar, reg);
 +		pci_read(domain, bus, dev, func, bar, &size);
 +		pci_write(domain, bus, dev, func, bar, reg);
  		if (PCI_MAPREG_TYPE(reg) == PCI_MAPREG_TYPE_IO) {
  			region->is_IO = 1;
-@@ -286,66 +372,185 @@ pci_device_netbsd_probe(struct pci_devic
+@@ -286,66 +374,189 @@ pci_device_netbsd_probe(struct pci_devic
  				bar += sizeof(uint32_t);
 -				err = pci_read(bus, dev, func, bar, &reg);
 +				err = pci_read(domain, bus, dev, func, bar, &reg);
  				if (err)
  					return err;
  				reg64 |= (uint64_t)reg << 32;
 -				err = pci_write(bus, dev, func, bar, ~0);
 +				err = pci_write(domain, bus, dev, func, bar,
 +				    (unsigned int)~0);
  				if (err)
 @@ -579,27 +582,31 @@ Improve NetBSD support. From Michael Lor
 -	pci_device_netbsd_unmap_range,
 -	pci_device_netbsd_read,
 -	pci_device_netbsd_write,
 -	pci_fill_capabilities_generic
 +	.destroy = pci_system_netbsd_destroy,
 +	.destroy_device = NULL,
 +	.read_rom = pci_device_netbsd_read_rom,
 +	.probe = pci_device_netbsd_probe,
 +	.map_range = pci_device_netbsd_map_range,
 +	.unmap_range = pci_device_netbsd_unmap_range,
 +	.read = pci_device_netbsd_read,
 +	.write = pci_device_netbsd_write,
 +	.fill_capabilities = pci_fill_capabilities_generic,
 +#if defined(WSDISPLAYIO_GET_BUSID)
 +	.boot_vga = pci_device_netbsd_boot_vga,
 +#else
 +	.boot_vga = NULL
 +#endif
  };
  int
  pci_system_netbsd_create(void)
+ {
  	struct pci_device_private *device;
 -	int bus, dev, func, ndevs, nfuncs;
 +	int bus, dev, func, ndevs, nfuncs, domain, pcifd;
  	uint32_t reg;
+-
 -	pcifd = open("/dev/pci0", O_RDWR | O_CLOEXEC);
 -	if (pcifd == -1)
 -		return ENXIO;
 @@ -626,27 +633,27 @@ Improve NetBSD support. From Michael Lor
 +		buses[nbuses].fd = pcifd;
 +		buses[nbuses].num = bus = businfo.busno;
 +		buses[nbuses].maxdevs = businfo.maxdevs;
 +		domain = nbuses;
 +		nbuses++;
 +		for (dev = 0; dev < businfo.maxdevs; dev++) {
 +			nfuncs = pci_nfuncs(domain, bus, dev);
  			for (func = 0; func < nfuncs; func++) {
 -				if (pci_read(bus, dev, func, PCI_ID_REG,
 +				if (pci_read(domain, bus, dev, func, PCI_ID_REG,
  				    &reg) != 0)
  					continue;
  				if (PCI_VENDOR(reg) == PCI_VENDOR_INVALID ||
-@@ -355,37 +560,43 @@ pci_system_netbsd_create(void)
+@@ -355,37 +566,43 @@ pci_system_netbsd_create(void)
  				ndevs++;
+ 			}
+ 		}
 +		snprintf(netbsd_devname, 32, "/dev/pci%d", nbuses);
 +		pcifd = open(netbsd_devname, O_RDWR);
+ 	}
  	pci_sys->num_devices = ndevs;
  	pci_sys->devices = calloc(ndevs, sizeof(struct pci_device_private));
  	if (pci_sys->devices == NULL) {
 +		int i;
++
 +		for (i = 0; i < nbuses; i++)
 @@ -679,24 +686,24 @@ Improve NetBSD support. From Michael Lor
  				device->base.bus = bus;
  				device->base.dev = dev;
  				device->base.func = func;
  				device->base.vendor_id = PCI_VENDOR(reg);
  				device->base.device_id = PCI_PRODUCT(reg);
 -				if (pci_read(bus, dev, func, PCI_CLASS_REG,
 -				    &reg) != 0)
 +				if (pci_read(domain, bus, dev, func,
 +				    PCI_CLASS_REG, &reg) != 0)
  					continue;
  				device->base.device_class =
-@@ -393,8 +604,8 @@ pci_system_netbsd_create(void)
+@@ -393,8 +610,8 @@ pci_system_netbsd_create(void)
  				    PCI_SUBCLASS(reg) << 8;
  				device->base.revision = PCI_REVISION(reg);
 -				if (pci_read(bus, dev, func, PCI_SUBSYS_ID_REG,
 -				    &reg) != 0)
 +				if (pci_read(domain, bus, dev, func,
 +				    PCI_SUBSYS_ID_REG, &reg) != 0)
  					continue;
  				device->base.subvendor_id = PCI_VENDOR(reg);

 @@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.14 2012/07/14 23:42:12 wiz Exp $
+$NetBSD: distinfo,v 1.15 2012/07/15 08:12:42 wiz Exp $
 SHA1 (libpciaccess-0.13.1.tar.bz2) = ae4dcf27a1b52c6a1fd90b21165fbaecae34e8ac
 RMD160 (libpciaccess-0.13.1.tar.bz2) = 2e4c94bd782e98d360664cc0ce3d5ad2d1b0045c
 Size (libpciaccess-0.13.1.tar.bz2) = 352351 bytes
 SHA1 (patch-aa) = 090e2dd9d811fc56354d5387cc51fb2b1b4a2820
-SHA1 (patch-ac) = b1ce055ff9c0b60ffd9c337eb78ef471065a5f4d
+SHA1 (patch-ac) = 060ce740ffb5d8a9ba71142075d49a6c0ff2c840