svn commit: r194843 - in projects/mesh11s: .
cddl/contrib/opensolaris contrib/bind9 contrib/cpio
contrib/csup contrib/ee contrib/file contrib/gdb
contrib/gdtoa contrib/less contrib/libpcap contrib/...
Rui Paulo
rpaulo at FreeBSD.org
Wed Jun 24 15:33:33 UTC 2009
Author: rpaulo
Date: Wed Jun 24 15:33:33 2009
New Revision: 194843
URL: http://svn.freebsd.org/changeset/base/194843
Log:
MFC 191056:191060
Modified:
projects/mesh11s/ (props changed)
projects/mesh11s/cddl/contrib/opensolaris/ (props changed)
projects/mesh11s/contrib/bind9/ (props changed)
projects/mesh11s/contrib/cpio/ (props changed)
projects/mesh11s/contrib/csup/ (props changed)
projects/mesh11s/contrib/ee/ (props changed)
projects/mesh11s/contrib/file/ (props changed)
projects/mesh11s/contrib/gdb/ (props changed)
projects/mesh11s/contrib/gdtoa/ (props changed)
projects/mesh11s/contrib/less/ (props changed)
projects/mesh11s/contrib/libpcap/ (props changed)
projects/mesh11s/contrib/ncurses/ (props changed)
projects/mesh11s/contrib/netcat/ (props changed)
projects/mesh11s/contrib/ntp/ (props changed)
projects/mesh11s/contrib/openbsm/ (props changed)
projects/mesh11s/contrib/openpam/ (props changed)
projects/mesh11s/contrib/pf/ (props changed)
projects/mesh11s/contrib/sendmail/ (props changed)
projects/mesh11s/contrib/tcpdump/ (props changed)
projects/mesh11s/contrib/top/ (props changed)
projects/mesh11s/contrib/top/install-sh (props changed)
projects/mesh11s/contrib/wpa/ (props changed)
projects/mesh11s/crypto/openssh/ (props changed)
projects/mesh11s/crypto/openssl/ (props changed)
projects/mesh11s/lib/libc/ (props changed)
projects/mesh11s/lib/libc/stdio/asprintf.c (props changed)
projects/mesh11s/lib/libc/stdtime/ (props changed)
projects/mesh11s/lib/libc/string/ffsll.c (props changed)
projects/mesh11s/lib/libc/string/flsll.c (props changed)
projects/mesh11s/lib/libc/string/wcpcpy.c (props changed)
projects/mesh11s/lib/libc/string/wcpncpy.c (props changed)
projects/mesh11s/lib/libusb/ (props changed)
projects/mesh11s/lib/libusb/libusb20.3 (props changed)
projects/mesh11s/lib/libusb/usb.h (props changed)
projects/mesh11s/lib/libutil/ (props changed)
projects/mesh11s/sbin/ (props changed)
projects/mesh11s/sbin/ipfw/ (props changed)
projects/mesh11s/share/zoneinfo/ (props changed)
projects/mesh11s/sys/ (props changed)
projects/mesh11s/sys/amd64/include/xen/ (props changed)
projects/mesh11s/sys/cddl/contrib/opensolaris/ (props changed)
projects/mesh11s/sys/contrib/dev/acpica/ (props changed)
projects/mesh11s/sys/contrib/pf/ (props changed)
projects/mesh11s/sys/dev/agp/agp.c
projects/mesh11s/sys/dev/ata/ (props changed)
projects/mesh11s/sys/dev/ata/ata-usb.c (props changed)
projects/mesh11s/sys/dev/cxgb/ (props changed)
projects/mesh11s/sys/dev/powermac_nvram/powermac_nvram.c
projects/mesh11s/sys/dev/sound/usb/uaudio.c (props changed)
projects/mesh11s/sys/dev/sound/usb/uaudio.h (props changed)
projects/mesh11s/sys/dev/sound/usb/uaudio_pcm.c (props changed)
projects/mesh11s/sys/dev/sound/usb/uaudioreg.h (props changed)
projects/mesh11s/sys/dev/usb/controller/at91dci.c (props changed)
projects/mesh11s/sys/dev/usb/controller/at91dci.h (props changed)
projects/mesh11s/sys/dev/usb/controller/at91dci_atmelarm.c (props changed)
projects/mesh11s/sys/dev/usb/controller/atmegadci.c (props changed)
projects/mesh11s/sys/dev/usb/controller/atmegadci.h (props changed)
projects/mesh11s/sys/dev/usb/controller/atmegadci_atmelarm.c (props changed)
projects/mesh11s/sys/dev/usb/controller/ehci.c (props changed)
projects/mesh11s/sys/dev/usb/controller/ehci.h (props changed)
projects/mesh11s/sys/dev/usb/controller/ehci_ixp4xx.c (props changed)
projects/mesh11s/sys/dev/usb/controller/ehci_mbus.c (props changed)
projects/mesh11s/sys/dev/usb/controller/ehci_pci.c (props changed)
projects/mesh11s/sys/dev/usb/controller/musb_otg.c (props changed)
projects/mesh11s/sys/dev/usb/controller/musb_otg.h (props changed)
projects/mesh11s/sys/dev/usb/controller/musb_otg_atmelarm.c (props changed)
projects/mesh11s/sys/dev/usb/controller/ohci.c (props changed)
projects/mesh11s/sys/dev/usb/controller/ohci.h (props changed)
projects/mesh11s/sys/dev/usb/controller/ohci_atmelarm.c (props changed)
projects/mesh11s/sys/dev/usb/controller/ohci_pci.c (props changed)
projects/mesh11s/sys/dev/usb/controller/uhci.c (props changed)
projects/mesh11s/sys/dev/usb/controller/uhci.h (props changed)
projects/mesh11s/sys/dev/usb/controller/uhci_pci.c (props changed)
projects/mesh11s/sys/dev/usb/controller/usb_controller.c (props changed)
projects/mesh11s/sys/dev/usb/controller/uss820dci.c (props changed)
projects/mesh11s/sys/dev/usb/controller/uss820dci.h (props changed)
projects/mesh11s/sys/dev/usb/controller/uss820dci_atmelarm.c (props changed)
projects/mesh11s/sys/dev/usb/input/uhid.c (props changed)
projects/mesh11s/sys/dev/usb/input/ukbd.c (props changed)
projects/mesh11s/sys/dev/usb/input/ums.c (props changed)
projects/mesh11s/sys/dev/usb/input/usb_rdesc.h (props changed)
projects/mesh11s/sys/dev/usb/misc/udbp.c (props changed)
projects/mesh11s/sys/dev/usb/misc/udbp.h (props changed)
projects/mesh11s/sys/dev/usb/misc/ufm.c (props changed)
projects/mesh11s/sys/dev/usb/net/if_aue.c (props changed)
projects/mesh11s/sys/dev/usb/net/if_auereg.h (props changed)
projects/mesh11s/sys/dev/usb/net/if_axe.c (props changed)
projects/mesh11s/sys/dev/usb/net/if_axereg.h (props changed)
projects/mesh11s/sys/dev/usb/net/if_cdce.c (props changed)
projects/mesh11s/sys/dev/usb/net/if_cdcereg.h (props changed)
projects/mesh11s/sys/dev/usb/net/if_cue.c (props changed)
projects/mesh11s/sys/dev/usb/net/if_cuereg.h (props changed)
projects/mesh11s/sys/dev/usb/net/if_kue.c (props changed)
projects/mesh11s/sys/dev/usb/net/if_kuefw.h (props changed)
projects/mesh11s/sys/dev/usb/net/if_kuereg.h (props changed)
projects/mesh11s/sys/dev/usb/net/if_rue.c (props changed)
projects/mesh11s/sys/dev/usb/net/if_ruereg.h (props changed)
projects/mesh11s/sys/dev/usb/net/if_udav.c (props changed)
projects/mesh11s/sys/dev/usb/net/if_udavreg.h (props changed)
projects/mesh11s/sys/dev/usb/net/usb_ethernet.c (props changed)
projects/mesh11s/sys/dev/usb/net/usb_ethernet.h (props changed)
projects/mesh11s/sys/dev/usb/quirk/usb_quirk.c (props changed)
projects/mesh11s/sys/dev/usb/quirk/usb_quirk.h (props changed)
projects/mesh11s/sys/dev/usb/serial/u3g.c (props changed)
projects/mesh11s/sys/dev/usb/serial/uark.c (props changed)
projects/mesh11s/sys/dev/usb/serial/ubsa.c (props changed)
projects/mesh11s/sys/dev/usb/serial/ubser.c (props changed)
projects/mesh11s/sys/dev/usb/serial/uchcom.c (props changed)
projects/mesh11s/sys/dev/usb/serial/ucycom.c (props changed)
projects/mesh11s/sys/dev/usb/serial/ufoma.c (props changed)
projects/mesh11s/sys/dev/usb/serial/uftdi.c (props changed)
projects/mesh11s/sys/dev/usb/serial/uftdi_reg.h (props changed)
projects/mesh11s/sys/dev/usb/serial/ugensa.c (props changed)
projects/mesh11s/sys/dev/usb/serial/uipaq.c (props changed)
projects/mesh11s/sys/dev/usb/serial/ulpt.c (props changed)
projects/mesh11s/sys/dev/usb/serial/umct.c (props changed)
projects/mesh11s/sys/dev/usb/serial/umodem.c (props changed)
projects/mesh11s/sys/dev/usb/serial/umoscom.c (props changed)
projects/mesh11s/sys/dev/usb/serial/uplcom.c (props changed)
projects/mesh11s/sys/dev/usb/serial/usb_serial.c (props changed)
projects/mesh11s/sys/dev/usb/serial/usb_serial.h (props changed)
projects/mesh11s/sys/dev/usb/serial/uslcom.c (props changed)
projects/mesh11s/sys/dev/usb/serial/uvisor.c (props changed)
projects/mesh11s/sys/dev/usb/serial/uvscom.c (props changed)
projects/mesh11s/sys/dev/usb/storage/rio500_usb.h (props changed)
projects/mesh11s/sys/dev/usb/storage/umass.c (props changed)
projects/mesh11s/sys/dev/usb/storage/urio.c (props changed)
projects/mesh11s/sys/dev/usb/storage/ustorage_fs.c (props changed)
projects/mesh11s/sys/dev/usb/template/usb_template.c (props changed)
projects/mesh11s/sys/dev/usb/template/usb_template.h (props changed)
projects/mesh11s/sys/dev/usb/template/usb_template_cdce.c (props changed)
projects/mesh11s/sys/dev/usb/template/usb_template_msc.c (props changed)
projects/mesh11s/sys/dev/usb/template/usb_template_mtp.c (props changed)
projects/mesh11s/sys/dev/usb/ufm_ioctl.h (props changed)
projects/mesh11s/sys/dev/usb/usb.h (props changed)
projects/mesh11s/sys/dev/usb/usb_bus.h (props changed)
projects/mesh11s/sys/dev/usb/usb_busdma.c (props changed)
projects/mesh11s/sys/dev/usb/usb_busdma.h (props changed)
projects/mesh11s/sys/dev/usb/usb_cdc.h (props changed)
projects/mesh11s/sys/dev/usb/usb_compat_linux.c (props changed)
projects/mesh11s/sys/dev/usb/usb_compat_linux.h (props changed)
projects/mesh11s/sys/dev/usb/usb_controller.h (props changed)
projects/mesh11s/sys/dev/usb/usb_core.c (props changed)
projects/mesh11s/sys/dev/usb/usb_core.h (props changed)
projects/mesh11s/sys/dev/usb/usb_debug.c (props changed)
projects/mesh11s/sys/dev/usb/usb_debug.h (props changed)
projects/mesh11s/sys/dev/usb/usb_dev.c (props changed)
projects/mesh11s/sys/dev/usb/usb_dev.h (props changed)
projects/mesh11s/sys/dev/usb/usb_device.c (props changed)
projects/mesh11s/sys/dev/usb/usb_device.h (props changed)
projects/mesh11s/sys/dev/usb/usb_dynamic.c (props changed)
projects/mesh11s/sys/dev/usb/usb_dynamic.h (props changed)
projects/mesh11s/sys/dev/usb/usb_endian.h (props changed)
projects/mesh11s/sys/dev/usb/usb_error.c (props changed)
projects/mesh11s/sys/dev/usb/usb_generic.c (props changed)
projects/mesh11s/sys/dev/usb/usb_generic.h (props changed)
projects/mesh11s/sys/dev/usb/usb_handle_request.c (props changed)
projects/mesh11s/sys/dev/usb/usb_hid.c (props changed)
projects/mesh11s/sys/dev/usb/usb_hub.c (props changed)
projects/mesh11s/sys/dev/usb/usb_hub.h (props changed)
projects/mesh11s/sys/dev/usb/usb_if.m (props changed)
projects/mesh11s/sys/dev/usb/usb_ioctl.h (props changed)
projects/mesh11s/sys/dev/usb/usb_lookup.c (props changed)
projects/mesh11s/sys/dev/usb/usb_mbuf.c (props changed)
projects/mesh11s/sys/dev/usb/usb_mbuf.h (props changed)
projects/mesh11s/sys/dev/usb/usb_msctest.c (props changed)
projects/mesh11s/sys/dev/usb/usb_msctest.h (props changed)
projects/mesh11s/sys/dev/usb/usb_parse.c (props changed)
projects/mesh11s/sys/dev/usb/usb_pci.h (props changed)
projects/mesh11s/sys/dev/usb/usb_process.c (props changed)
projects/mesh11s/sys/dev/usb/usb_process.h (props changed)
projects/mesh11s/sys/dev/usb/usb_request.c (props changed)
projects/mesh11s/sys/dev/usb/usb_request.h (props changed)
projects/mesh11s/sys/dev/usb/usb_transfer.c (props changed)
projects/mesh11s/sys/dev/usb/usb_transfer.h (props changed)
projects/mesh11s/sys/dev/usb/usb_util.c (props changed)
projects/mesh11s/sys/dev/usb/usb_util.h (props changed)
projects/mesh11s/sys/dev/usb/usbdevs (props changed)
projects/mesh11s/sys/dev/usb/usbhid.h (props changed)
projects/mesh11s/sys/dev/usb/wlan/if_rum.c (props changed)
projects/mesh11s/sys/dev/usb/wlan/if_rumfw.h (props changed)
projects/mesh11s/sys/dev/usb/wlan/if_rumreg.h (props changed)
projects/mesh11s/sys/dev/usb/wlan/if_rumvar.h (props changed)
projects/mesh11s/sys/dev/usb/wlan/if_ural.c (props changed)
projects/mesh11s/sys/dev/usb/wlan/if_uralreg.h (props changed)
projects/mesh11s/sys/dev/usb/wlan/if_uralvar.h (props changed)
projects/mesh11s/sys/dev/usb/wlan/if_zyd.c (props changed)
projects/mesh11s/sys/dev/usb/wlan/if_zydfw.h (props changed)
projects/mesh11s/sys/dev/usb/wlan/if_zydreg.h (props changed)
projects/mesh11s/sys/dev/xen/netfront/ (props changed)
projects/mesh11s/sys/dev/xen/xenpci/ (props changed)
projects/mesh11s/sys/modules/dtrace/dtnfsclient/ (props changed)
projects/mesh11s/sys/modules/ip6_mroute_mod/ (props changed)
projects/mesh11s/sys/modules/ipmi/ipmi_linux/ (props changed)
projects/mesh11s/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c (props changed)
projects/mesh11s/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h (props changed)
projects/mesh11s/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c (props changed)
projects/mesh11s/sys/netinet/ipfw/ip_dummynet.c (props changed)
projects/mesh11s/sys/netinet/ipfw/ip_fw2.c (props changed)
projects/mesh11s/sys/netinet/ipfw/ip_fw_nat.c (props changed)
projects/mesh11s/sys/netinet/ipfw/ip_fw_pfil.c (props changed)
projects/mesh11s/sys/netipx/spx_reass.c (props changed)
projects/mesh11s/sys/xen/evtchn.h (props changed)
projects/mesh11s/sys/xen/hypervisor.h (props changed)
projects/mesh11s/sys/xen/xen_intr.h (props changed)
projects/mesh11s/tools/regression/lib/msun/test-conj.t (props changed)
projects/mesh11s/tools/regression/usr.bin/pkill/pgrep-_g.t (props changed)
projects/mesh11s/tools/regression/usr.bin/pkill/pgrep-_s.t (props changed)
projects/mesh11s/tools/regression/usr.bin/pkill/pkill-_g.t (props changed)
projects/mesh11s/tools/tools/ath/common/dumpregs.h (props changed)
projects/mesh11s/tools/tools/ath/common/dumpregs_5210.c (props changed)
projects/mesh11s/tools/tools/ath/common/dumpregs_5211.c (props changed)
projects/mesh11s/tools/tools/ath/common/dumpregs_5212.c (props changed)
projects/mesh11s/tools/tools/ath/common/dumpregs_5416.c (props changed)
projects/mesh11s/tools/tools/termcap/termcap.pl (props changed)
projects/mesh11s/usr.bin/csup/ (props changed)
projects/mesh11s/usr.bin/procstat/ (props changed)
projects/mesh11s/usr.sbin/dumpcis/cardinfo.h (props changed)
projects/mesh11s/usr.sbin/dumpcis/cis.h (props changed)
projects/mesh11s/usr.sbin/makefs/ffs/ffs_bswap.c (props changed)
projects/mesh11s/usr.sbin/makefs/ffs/ffs_subr.c (props changed)
projects/mesh11s/usr.sbin/makefs/ffs/ufs_bswap.h (props changed)
projects/mesh11s/usr.sbin/makefs/getid.c (props changed)
projects/mesh11s/usr.sbin/zic/ (props changed)
Modified: projects/mesh11s/sys/dev/agp/agp.c
==============================================================================
--- projects/mesh11s/sys/dev/agp/agp.c Wed Jun 24 15:32:57 2009 (r194842)
+++ projects/mesh11s/sys/dev/agp/agp.c Wed Jun 24 15:33:33 2009 (r194843)
@@ -81,7 +81,6 @@ static struct cdevsw agp_cdevsw = {
};
static devclass_t agp_devclass;
-#define KDEV2DEV(kdev) devclass_get_device(agp_devclass, dev2unit(kdev))
/* Helper functions for implementing chipset mini drivers. */
@@ -254,11 +253,8 @@ agp_generic_attach(device_t dev)
sc->as_nextid = 1;
sc->as_devnode = make_dev(&agp_cdevsw,
- device_get_unit(dev),
- UID_ROOT,
- GID_WHEEL,
- 0600,
- "agpgart");
+ 0, UID_ROOT, GID_WHEEL, 0600, "agpgart");
+ sc->as_devnode->si_drv1 = dev;
return 0;
}
@@ -802,7 +798,7 @@ agp_unbind_user(device_t dev, agp_unbind
static int
agp_open(struct cdev *kdev, int oflags, int devtype, struct thread *td)
{
- device_t dev = KDEV2DEV(kdev);
+ device_t dev = kdev->si_drv1;
struct agp_softc *sc = device_get_softc(dev);
if (!sc->as_isopen) {
@@ -816,7 +812,7 @@ agp_open(struct cdev *kdev, int oflags,
static int
agp_close(struct cdev *kdev, int fflag, int devtype, struct thread *td)
{
- device_t dev = KDEV2DEV(kdev);
+ device_t dev = kdev->si_drv1;
struct agp_softc *sc = device_get_softc(dev);
struct agp_memory *mem;
@@ -839,7 +835,7 @@ agp_close(struct cdev *kdev, int fflag,
static int
agp_ioctl(struct cdev *kdev, u_long cmd, caddr_t data, int fflag, struct thread *td)
{
- device_t dev = KDEV2DEV(kdev);
+ device_t dev = kdev->si_drv1;
switch (cmd) {
case AGPIOC_INFO:
@@ -874,7 +870,7 @@ agp_ioctl(struct cdev *kdev, u_long cmd,
static int
agp_mmap(struct cdev *kdev, vm_offset_t offset, vm_paddr_t *paddr, int prot)
{
- device_t dev = KDEV2DEV(kdev);
+ device_t dev = kdev->si_drv1;
struct agp_softc *sc = device_get_softc(dev);
if (offset > AGP_GET_APERTURE(dev))
Modified: projects/mesh11s/sys/dev/powermac_nvram/powermac_nvram.c
==============================================================================
--- projects/mesh11s/sys/dev/powermac_nvram/powermac_nvram.c Wed Jun 24 15:32:57 2009 (r194842)
+++ projects/mesh11s/sys/dev/powermac_nvram/powermac_nvram.c Wed Jun 24 15:33:33 2009 (r194843)
@@ -89,10 +89,6 @@ DRIVER_MODULE(powermac_nvram, nexus, pow
* Cdev methods.
*/
-#define NVRAM_UNIT(dev) dev2unit(dev)
-#define NVRAM_SOFTC(unit) ((struct powermac_nvram_softc *) \
- devclass_get_softc(powermac_nvram_devclass, unit))
-
static d_open_t powermac_nvram_open;
static d_close_t powermac_nvram_close;
static d_read_t powermac_nvram_read;
@@ -169,6 +165,7 @@ powermac_nvram_attach(device_t dev)
sc->sc_cdev = make_dev(&powermac_nvram_cdevsw, 0, 0, 0, 0600,
"powermac_nvram");
+ sc->sc_cdev->si_drv1 = sc;
return 0;
}
@@ -192,9 +189,8 @@ powermac_nvram_detach(device_t dev)
static int
powermac_nvram_open(struct cdev *dev, int flags, int fmt, struct thread *td)
{
- struct powermac_nvram_softc *sc;
+ struct powermac_nvram_softc *sc = dev->si_drv1;
- sc = NVRAM_SOFTC(NVRAM_UNIT(dev));
if (sc->sc_isopen)
return EBUSY;
sc->sc_isopen = 1;
@@ -205,12 +201,10 @@ powermac_nvram_open(struct cdev *dev, in
static int
powermac_nvram_close(struct cdev *dev, int fflag, int devtype, struct thread *td)
{
- struct powermac_nvram_softc *sc;
+ struct powermac_nvram_softc *sc = dev->si_drv1;
struct core99_header *header;
vm_offset_t bank;
- sc = NVRAM_SOFTC(NVRAM_UNIT(dev));
-
if (sc->sc_wpos != sizeof(sc->sc_data)) {
/* Short write, restore in-memory copy */
bcopy((void *)sc->sc_bank, (void *)sc->sc_data, NVRAM_SIZE);
@@ -246,9 +240,7 @@ static int
powermac_nvram_read(struct cdev *dev, struct uio *uio, int ioflag)
{
int rv, amnt, data_available;
- struct powermac_nvram_softc *sc;
-
- sc = NVRAM_SOFTC(NVRAM_UNIT(dev));
+ struct powermac_nvram_softc *sc = dev->si_drv1;
rv = 0;
while (uio->uio_resid > 0) {
@@ -271,9 +263,7 @@ static int
powermac_nvram_write(struct cdev *dev, struct uio *uio, int ioflag)
{
int rv, amnt, data_available;
- struct powermac_nvram_softc *sc;
-
- sc = NVRAM_SOFTC(NVRAM_UNIT(dev));
+ struct powermac_nvram_softc *sc = dev->si_drv1;
if (sc->sc_wpos >= sizeof(sc->sc_data))
return EINVAL;
More information about the svn-src-projects
mailing list