Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 11 Sep 2010 01:23:24 +0000 (UTC)
From:      Weongyo Jeong <weongyo@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-user@freebsd.org
Subject:   svn commit: r212447 - in user/weongyo/usb/sys/dev/usb: . controller
Message-ID:  <201009110123.o8B1NOW6010745@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: weongyo
Date: Sat Sep 11 01:23:24 2010
New Revision: 212447
URL: http://svn.freebsd.org/changeset/base/212447

Log:
  Generalizes the usage of function pointer like BSD's other sources.
  While I'm here changes the variable name from `cb' to `func' which is
  one of confusing.

Modified:
  user/weongyo/usb/sys/dev/usb/controller/ehci.c
  user/weongyo/usb/sys/dev/usb/controller/ehci.h
  user/weongyo/usb/sys/dev/usb/controller/ehci_ixp4xx.c
  user/weongyo/usb/sys/dev/usb/controller/ehci_mv.c
  user/weongyo/usb/sys/dev/usb/controller/ehci_pci.c
  user/weongyo/usb/sys/dev/usb/controller/ohci.c
  user/weongyo/usb/sys/dev/usb/controller/ohci.h
  user/weongyo/usb/sys/dev/usb/controller/ohci_atmelarm.c
  user/weongyo/usb/sys/dev/usb/controller/ohci_pci.c
  user/weongyo/usb/sys/dev/usb/controller/ohci_s3c24x0.c
  user/weongyo/usb/sys/dev/usb/controller/uhci.c
  user/weongyo/usb/sys/dev/usb/controller/uhci.h
  user/weongyo/usb/sys/dev/usb/controller/uhci_pci.c
  user/weongyo/usb/sys/dev/usb/controller/usb_controller.c
  user/weongyo/usb/sys/dev/usb/usb_controller.h

Modified: user/weongyo/usb/sys/dev/usb/controller/ehci.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/controller/ehci.c	Sat Sep 11 01:08:16 2010	(r212446)
+++ user/weongyo/usb/sys/dev/usb/controller/ehci.c	Sat Sep 11 01:23:24 2010	(r212447)
@@ -149,31 +149,31 @@ struct ehci_std_temp {
 };
 
 void
-ehci_iterate_hw_softc(struct usb_bus *bus, usb_bus_mem_sub_cb_t *cb)
+ehci_iterate_hw_softc(struct usb_bus *bus, usb_bus_mem_sub_callback_t *func)
 {
 	ehci_softc_t *sc = EHCI_BUS2SC(bus);
 	uint32_t i;
 
-	cb(bus, &sc->sc_hw.pframes_pc, &sc->sc_hw.pframes_pg,
+	(*func)(bus, &sc->sc_hw.pframes_pc, &sc->sc_hw.pframes_pg,
 	    sizeof(uint32_t) * EHCI_FRAMELIST_COUNT, EHCI_FRAMELIST_ALIGN);
 
-	cb(bus, &sc->sc_hw.async_start_pc, &sc->sc_hw.async_start_pg,
+	(*func)(bus, &sc->sc_hw.async_start_pc, &sc->sc_hw.async_start_pg,
 	    sizeof(ehci_qh_t), EHCI_QH_ALIGN);
 
 	for (i = 0; i != EHCI_VIRTUAL_FRAMELIST_COUNT; i++) {
-		cb(bus, sc->sc_hw.intr_start_pc + i,
+		(*func)(bus, sc->sc_hw.intr_start_pc + i,
 		    sc->sc_hw.intr_start_pg + i,
 		    sizeof(ehci_qh_t), EHCI_QH_ALIGN);
 	}
 
 	for (i = 0; i != EHCI_VIRTUAL_FRAMELIST_COUNT; i++) {
-		cb(bus, sc->sc_hw.isoc_hs_start_pc + i,
+		(*func)(bus, sc->sc_hw.isoc_hs_start_pc + i,
 		    sc->sc_hw.isoc_hs_start_pg + i,
 		    sizeof(ehci_itd_t), EHCI_ITD_ALIGN);
 	}
 
 	for (i = 0; i != EHCI_VIRTUAL_FRAMELIST_COUNT; i++) {
-		cb(bus, sc->sc_hw.isoc_fs_start_pc + i,
+		(*func)(bus, sc->sc_hw.isoc_fs_start_pc + i,
 		    sc->sc_hw.isoc_fs_start_pg + i,
 		    sizeof(ehci_sitd_t), EHCI_SITD_ALIGN);
 	}
@@ -484,7 +484,7 @@ ehci_init(ehci_softc_t *sc)
 	}
 	/* flush all cache into memory */
 
-	usb_bus_mem_flush_all(&sc->sc_bus, &ehci_iterate_hw_softc);
+	usb_bus_mem_flush_all(&sc->sc_bus, ehci_iterate_hw_softc);
 
 #ifdef USB_DEBUG
 	if (ehcidebug) {

Modified: user/weongyo/usb/sys/dev/usb/controller/ehci.h
==============================================================================
--- user/weongyo/usb/sys/dev/usb/controller/ehci.h	Sat Sep 11 01:08:16 2010	(r212446)
+++ user/weongyo/usb/sys/dev/usb/controller/ehci.h	Sat Sep 11 01:23:24 2010	(r212447)
@@ -437,7 +437,7 @@ hc16toh(const struct ehci_softc *sc, con
 }
 #endif
 
-usb_bus_mem_cb_t ehci_iterate_hw_softc;
+usb_bus_mem_callback_t ehci_iterate_hw_softc;
 
 usb_error_t ehci_reset(ehci_softc_t *sc);
 usb_error_t ehci_init(ehci_softc_t *sc);

Modified: user/weongyo/usb/sys/dev/usb/controller/ehci_ixp4xx.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/controller/ehci_ixp4xx.c	Sat Sep 11 01:08:16 2010	(r212446)
+++ user/weongyo/usb/sys/dev/usb/controller/ehci_ixp4xx.c	Sat Sep 11 01:23:24 2010	(r212447)
@@ -153,7 +153,7 @@ ehci_ixp_attach(device_t self)
 
 	/* get all DMA memory */
 	if (usb_bus_mem_alloc_all(&sc->sc_bus,
-	    USB_GET_DMA_TAG(self), &ehci_iterate_hw_softc)) {
+	    USB_GET_DMA_TAG(self), ehci_iterate_hw_softc)) {
 		return (ENOMEM);
 	}
 
@@ -291,7 +291,7 @@ ehci_ixp_detach(device_t self)
 		    sc->sc_io_res);
 		sc->sc_io_res = NULL;
 	}
-	usb_bus_mem_free_all(&sc->sc_bus, &ehci_iterate_hw_softc);
+	usb_bus_mem_free_all(&sc->sc_bus, ehci_iterate_hw_softc);
 
 	return (0);
 }

Modified: user/weongyo/usb/sys/dev/usb/controller/ehci_mv.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/controller/ehci_mv.c	Sat Sep 11 01:08:16 2010	(r212446)
+++ user/weongyo/usb/sys/dev/usb/controller/ehci_mv.c	Sat Sep 11 01:23:24 2010	(r212447)
@@ -168,7 +168,7 @@ mv_ehci_attach(device_t self)
 
 	/* get all DMA memory */
 	if (usb_bus_mem_alloc_all(&sc->sc_bus,
-	    USB_GET_DMA_TAG(self), &ehci_iterate_hw_softc)) {
+	    USB_GET_DMA_TAG(self), ehci_iterate_hw_softc)) {
 		return (ENOMEM);
 	}
 
@@ -333,7 +333,7 @@ mv_ehci_detach(device_t self)
 		    sc->sc_io_res);
 		sc->sc_io_res = NULL;
 	}
-	usb_bus_mem_free_all(&sc->sc_bus, &ehci_iterate_hw_softc);
+	usb_bus_mem_free_all(&sc->sc_bus, ehci_iterate_hw_softc);
 
 	return (0);
 }

Modified: user/weongyo/usb/sys/dev/usb/controller/ehci_pci.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/controller/ehci_pci.c	Sat Sep 11 01:08:16 2010	(r212446)
+++ user/weongyo/usb/sys/dev/usb/controller/ehci_pci.c	Sat Sep 11 01:23:24 2010	(r212447)
@@ -308,7 +308,7 @@ ehci_pci_attach(device_t self)
 
 	/* get all DMA memory */
 	if (usb_bus_mem_alloc_all(&sc->sc_bus,
-	    USB_GET_DMA_TAG(self), &ehci_iterate_hw_softc)) {
+	    USB_GET_DMA_TAG(self), ehci_iterate_hw_softc)) {
 		return (ENOMEM);
 	}
 
@@ -534,7 +534,7 @@ ehci_pci_detach(device_t self)
 		    sc->sc_io_res);
 		sc->sc_io_res = NULL;
 	}
-	usb_bus_mem_free_all(&sc->sc_bus, &ehci_iterate_hw_softc);
+	usb_bus_mem_free_all(&sc->sc_bus, ehci_iterate_hw_softc);
 
 	return (0);
 }

Modified: user/weongyo/usb/sys/dev/usb/controller/ohci.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/controller/ohci.c	Sat Sep 11 01:08:16 2010	(r212446)
+++ user/weongyo/usb/sys/dev/usb/controller/ohci.c	Sat Sep 11 01:23:24 2010	(r212447)
@@ -143,25 +143,26 @@ ohci_get_hcca(ohci_softc_t *sc)
 }
 
 void
-ohci_iterate_hw_softc(struct usb_bus *bus, usb_bus_mem_sub_cb_t *cb)
+ohci_iterate_hw_softc(struct usb_bus *bus, usb_bus_mem_sub_callback_t *func)
 {
 	struct ohci_softc *sc = OHCI_BUS2SC(bus);
 	uint32_t i;
 
-	cb(bus, &sc->sc_hw.hcca_pc, &sc->sc_hw.hcca_pg,
+	(*func)(bus, &sc->sc_hw.hcca_pc, &sc->sc_hw.hcca_pg,
 	    sizeof(ohci_hcca_t), OHCI_HCCA_ALIGN);
 
-	cb(bus, &sc->sc_hw.ctrl_start_pc, &sc->sc_hw.ctrl_start_pg,
+	(*func)(bus, &sc->sc_hw.ctrl_start_pc, &sc->sc_hw.ctrl_start_pg,
 	    sizeof(ohci_ed_t), OHCI_ED_ALIGN);
 
-	cb(bus, &sc->sc_hw.bulk_start_pc, &sc->sc_hw.bulk_start_pg,
+	(*func)(bus, &sc->sc_hw.bulk_start_pc, &sc->sc_hw.bulk_start_pg,
 	    sizeof(ohci_ed_t), OHCI_ED_ALIGN);
 
-	cb(bus, &sc->sc_hw.isoc_start_pc, &sc->sc_hw.isoc_start_pg,
+	(*func)(bus, &sc->sc_hw.isoc_start_pc, &sc->sc_hw.isoc_start_pg,
 	    sizeof(ohci_ed_t), OHCI_ED_ALIGN);
 
 	for (i = 0; i != OHCI_NO_EDS; i++) {
-		cb(bus, sc->sc_hw.intr_start_pc + i, sc->sc_hw.intr_start_pg + i,
+		(*func)(bus, sc->sc_hw.intr_start_pc + i,
+		    sc->sc_hw.intr_start_pg + i,
 		    sizeof(ohci_ed_t), OHCI_ED_ALIGN);
 	}
 }
@@ -396,7 +397,7 @@ ohci_init(ohci_softc_t *sc)
 	}
 	/* flush all cache into memory */
 
-	usb_bus_mem_flush_all(&sc->sc_bus, &ohci_iterate_hw_softc);
+	usb_bus_mem_flush_all(&sc->sc_bus, ohci_iterate_hw_softc);
 
 	/* set up the bus struct */
 	sc->sc_bus.methods = &ohci_bus_methods;

Modified: user/weongyo/usb/sys/dev/usb/controller/ohci.h
==============================================================================
--- user/weongyo/usb/sys/dev/usb/controller/ohci.h	Sat Sep 11 01:08:16 2010	(r212446)
+++ user/weongyo/usb/sys/dev/usb/controller/ohci.h	Sat Sep 11 01:23:24 2010	(r212447)
@@ -256,7 +256,7 @@ typedef struct ohci_softc {
 
 } ohci_softc_t;
 
-usb_bus_mem_cb_t ohci_iterate_hw_softc;
+usb_bus_mem_callback_t ohci_iterate_hw_softc;
 
 usb_error_t ohci_init(ohci_softc_t *sc);
 void	ohci_detach(struct ohci_softc *sc);

Modified: user/weongyo/usb/sys/dev/usb/controller/ohci_atmelarm.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/controller/ohci_atmelarm.c	Sat Sep 11 01:08:16 2010	(r212446)
+++ user/weongyo/usb/sys/dev/usb/controller/ohci_atmelarm.c	Sat Sep 11 01:23:24 2010	(r212447)
@@ -95,7 +95,7 @@ ohci_atmelarm_attach(device_t dev)
 
 	/* get all DMA memory */
 	if (usb_bus_mem_alloc_all(&sc->sc_ohci.sc_bus,
-	    USB_GET_DMA_TAG(dev), &ohci_iterate_hw_softc)) {
+	    USB_GET_DMA_TAG(dev), ohci_iterate_hw_softc)) {
 		return (ENOMEM);
 	}
 	sc->iclk = at91_pmc_clock_ref("ohci_clk");
@@ -212,7 +212,7 @@ ohci_atmelarm_detach(device_t dev)
 		    sc->sc_ohci.sc_io_res);
 		sc->sc_ohci.sc_io_res = NULL;
 	}
-	usb_bus_mem_free_all(&sc->sc_ohci.sc_bus, &ohci_iterate_hw_softc);
+	usb_bus_mem_free_all(&sc->sc_ohci.sc_bus, ohci_iterate_hw_softc);
 
 	return (0);
 }

Modified: user/weongyo/usb/sys/dev/usb/controller/ohci_pci.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/controller/ohci_pci.c	Sat Sep 11 01:08:16 2010	(r212446)
+++ user/weongyo/usb/sys/dev/usb/controller/ohci_pci.c	Sat Sep 11 01:23:24 2010	(r212447)
@@ -224,7 +224,7 @@ ohci_pci_attach(device_t self)
 
 	/* get all DMA memory */
 	if (usb_bus_mem_alloc_all(&sc->sc_bus, USB_GET_DMA_TAG(self),
-	    &ohci_iterate_hw_softc)) {
+	    ohci_iterate_hw_softc)) {
 		return (ENOMEM);
 	}
 	sc->sc_dev = self;
@@ -377,7 +377,7 @@ ohci_pci_detach(device_t self)
 		    sc->sc_io_res);
 		sc->sc_io_res = NULL;
 	}
-	usb_bus_mem_free_all(&sc->sc_bus, &ohci_iterate_hw_softc);
+	usb_bus_mem_free_all(&sc->sc_bus, ohci_iterate_hw_softc);
 
 	return (0);
 }

Modified: user/weongyo/usb/sys/dev/usb/controller/ohci_s3c24x0.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/controller/ohci_s3c24x0.c	Sat Sep 11 01:08:16 2010	(r212446)
+++ user/weongyo/usb/sys/dev/usb/controller/ohci_s3c24x0.c	Sat Sep 11 01:23:24 2010	(r212447)
@@ -88,7 +88,7 @@ ohci_s3c24x0_attach(device_t dev)
 
 	/* get all DMA memory */
 	if (usb_bus_mem_alloc_all(&sc->sc_bus, USB_GET_DMA_TAG(dev),
-	    &ohci_iterate_hw_softc)) {
+	    ohci_iterate_hw_softc)) {
 		return (ENOMEM);
 	}
 
@@ -189,7 +189,7 @@ ohci_s3c24x0_detach(device_t dev)
 		    sc->sc_io_res);
 		sc->sc_io_res = NULL;
 	}
-	usb_bus_mem_free_all(&sc->sc_bus, &ohci_iterate_hw_softc);
+	usb_bus_mem_free_all(&sc->sc_bus, ohci_iterate_hw_softc);
 
 	return (0);
 }

Modified: user/weongyo/usb/sys/dev/usb/controller/uhci.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/controller/uhci.c	Sat Sep 11 01:08:16 2010	(r212446)
+++ user/weongyo/usb/sys/dev/usb/controller/uhci.c	Sat Sep 11 01:23:24 2010	(r212447)
@@ -165,37 +165,37 @@ static uint8_t	uhci_check_transfer(struc
 static void	uhci_root_intr(uhci_softc_t *sc);
 
 void
-uhci_iterate_hw_softc(struct usb_bus *bus, usb_bus_mem_sub_cb_t *cb)
+uhci_iterate_hw_softc(struct usb_bus *bus, usb_bus_mem_sub_callback_t *func)
 {
 	struct uhci_softc *sc = UHCI_BUS2SC(bus);
 	uint32_t i;
 
-	cb(bus, &sc->sc_hw.pframes_pc, &sc->sc_hw.pframes_pg,
+	(*func)(bus, &sc->sc_hw.pframes_pc, &sc->sc_hw.pframes_pg,
 	    sizeof(uint32_t) * UHCI_FRAMELIST_COUNT, UHCI_FRAMELIST_ALIGN);
 
-	cb(bus, &sc->sc_hw.ls_ctl_start_pc, &sc->sc_hw.ls_ctl_start_pg,
+	(*func)(bus, &sc->sc_hw.ls_ctl_start_pc, &sc->sc_hw.ls_ctl_start_pg,
 	    sizeof(uhci_qh_t), UHCI_QH_ALIGN);
 
-	cb(bus, &sc->sc_hw.fs_ctl_start_pc, &sc->sc_hw.fs_ctl_start_pg,
+	(*func)(bus, &sc->sc_hw.fs_ctl_start_pc, &sc->sc_hw.fs_ctl_start_pg,
 	    sizeof(uhci_qh_t), UHCI_QH_ALIGN);
 
-	cb(bus, &sc->sc_hw.bulk_start_pc, &sc->sc_hw.bulk_start_pg,
+	(*func)(bus, &sc->sc_hw.bulk_start_pc, &sc->sc_hw.bulk_start_pg,
 	    sizeof(uhci_qh_t), UHCI_QH_ALIGN);
 
-	cb(bus, &sc->sc_hw.last_qh_pc, &sc->sc_hw.last_qh_pg,
+	(*func)(bus, &sc->sc_hw.last_qh_pc, &sc->sc_hw.last_qh_pg,
 	    sizeof(uhci_qh_t), UHCI_QH_ALIGN);
 
-	cb(bus, &sc->sc_hw.last_td_pc, &sc->sc_hw.last_td_pg,
+	(*func)(bus, &sc->sc_hw.last_td_pc, &sc->sc_hw.last_td_pg,
 	    sizeof(uhci_td_t), UHCI_TD_ALIGN);
 
 	for (i = 0; i != UHCI_VFRAMELIST_COUNT; i++) {
-		cb(bus, sc->sc_hw.isoc_start_pc + i,
+		(*func)(bus, sc->sc_hw.isoc_start_pc + i,
 		    sc->sc_hw.isoc_start_pg + i,
 		    sizeof(uhci_td_t), UHCI_TD_ALIGN);
 	}
 
 	for (i = 0; i != UHCI_IFRAMELIST_COUNT; i++) {
-		cb(bus, sc->sc_hw.intr_start_pc + i,
+		(*func)(bus, sc->sc_hw.intr_start_pc + i,
 		    sc->sc_hw.intr_start_pg + i,
 		    sizeof(uhci_qh_t), UHCI_QH_ALIGN);
 	}
@@ -640,7 +640,7 @@ uhci_init(uhci_softc_t *sc)
 	}
 	/* flush all cache into memory */
 
-	usb_bus_mem_flush_all(&sc->sc_bus, &uhci_iterate_hw_softc);
+	usb_bus_mem_flush_all(&sc->sc_bus, uhci_iterate_hw_softc);
 
 	/* set up the bus struct */
 	sc->sc_bus.methods = &uhci_bus_methods;

Modified: user/weongyo/usb/sys/dev/usb/controller/uhci.h
==============================================================================
--- user/weongyo/usb/sys/dev/usb/controller/uhci.h	Sat Sep 11 01:08:16 2010	(r212446)
+++ user/weongyo/usb/sys/dev/usb/controller/uhci.h	Sat Sep 11 01:23:24 2010	(r212447)
@@ -242,7 +242,7 @@ typedef struct uhci_softc {
 	char	sc_vendor[16];		/* vendor string for root hub */
 } uhci_softc_t;
 
-usb_bus_mem_cb_t uhci_iterate_hw_softc;
+usb_bus_mem_callback_t uhci_iterate_hw_softc;
 
 usb_error_t uhci_init(uhci_softc_t *sc);
 void	uhci_suspend(uhci_softc_t *sc);

Modified: user/weongyo/usb/sys/dev/usb/controller/uhci_pci.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/controller/uhci_pci.c	Sat Sep 11 01:08:16 2010	(r212446)
+++ user/weongyo/usb/sys/dev/usb/controller/uhci_pci.c	Sat Sep 11 01:23:24 2010	(r212447)
@@ -284,7 +284,7 @@ uhci_pci_attach(device_t self)
 
 	/* get all DMA memory */
 	if (usb_bus_mem_alloc_all(&sc->sc_bus, USB_GET_DMA_TAG(self),
-	    &uhci_iterate_hw_softc)) {
+	    uhci_iterate_hw_softc)) {
 		return ENOMEM;
 	}
 	sc->sc_dev = self;
@@ -442,7 +442,7 @@ uhci_pci_detach(device_t self)
 		    sc->sc_io_res);
 		sc->sc_io_res = NULL;
 	}
-	usb_bus_mem_free_all(&sc->sc_bus, &uhci_iterate_hw_softc);
+	usb_bus_mem_free_all(&sc->sc_bus, uhci_iterate_hw_softc);
 
 	return (0);
 }

Modified: user/weongyo/usb/sys/dev/usb/controller/usb_controller.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/controller/usb_controller.c	Sat Sep 11 01:08:16 2010	(r212446)
+++ user/weongyo/usb/sys/dev/usb/controller/usb_controller.c	Sat Sep 11 01:23:24 2010	(r212447)
@@ -485,10 +485,10 @@ usb_bus_mem_flush_all_cb(struct usb_bus 
  *------------------------------------------------------------------------*/
 #if USB_HAVE_BUSDMA
 void
-usb_bus_mem_flush_all(struct usb_bus *bus, usb_bus_mem_cb_t *cb)
+usb_bus_mem_flush_all(struct usb_bus *bus, usb_bus_mem_callback_t *func)
 {
-	if (cb) {
-		cb(bus, &usb_bus_mem_flush_all_cb);
+	if (func != NULL) {
+		(*func)(bus, usb_bus_mem_flush_all_cb);
 	}
 }
 #endif
@@ -519,7 +519,7 @@ usb_bus_mem_alloc_all_cb(struct usb_bus 
  *------------------------------------------------------------------------*/
 uint8_t
 usb_bus_mem_alloc_all(struct usb_bus *bus, bus_dma_tag_t dmat,
-    usb_bus_mem_cb_t *cb)
+    usb_bus_mem_callback_t *func)
 {
 	bus->alloc_failed = 0;
 
@@ -543,12 +543,12 @@ usb_bus_mem_alloc_all(struct usb_bus *bu
 		bus->alloc_failed = 1;		/* failure */
 	}
 #if USB_HAVE_BUSDMA
-	if (cb) {
-		cb(bus, &usb_bus_mem_alloc_all_cb);
+	if (func != NULL) {
+		(*func)(bus, usb_bus_mem_alloc_all_cb);
 	}
 #endif
 	if (bus->alloc_failed) {
-		usb_bus_mem_free_all(bus, cb);
+		usb_bus_mem_free_all(bus, func);
 	}
 	return (bus->alloc_failed);
 }
@@ -569,11 +569,11 @@ usb_bus_mem_free_all_cb(struct usb_bus *
  *	usb_bus_mem_free_all - factored out code
  *------------------------------------------------------------------------*/
 void
-usb_bus_mem_free_all(struct usb_bus *bus, usb_bus_mem_cb_t *cb)
+usb_bus_mem_free_all(struct usb_bus *bus, usb_bus_mem_callback_t *func)
 {
 #if USB_HAVE_BUSDMA
-	if (cb) {
-		cb(bus, &usb_bus_mem_free_all_cb);
+	if (func != NULL) {
+		(*func)(bus, usb_bus_mem_free_all_cb);
 	}
 	usb_dma_tag_unsetup(bus->dma_parent_tag);
 #endif

Modified: user/weongyo/usb/sys/dev/usb/usb_controller.h
==============================================================================
--- user/weongyo/usb/sys/dev/usb/usb_controller.h	Sat Sep 11 01:08:16 2010	(r212446)
+++ user/weongyo/usb/sys/dev/usb/usb_controller.h	Sat Sep 11 01:23:24 2010	(r212447)
@@ -45,8 +45,11 @@ struct usb_endpoint_descriptor;
 
 /* typedefs */
 
-typedef void (usb_bus_mem_sub_cb_t)(struct usb_bus *bus, struct usb_page_cache *pc, struct usb_page *pg, usb_size_t size, usb_size_t align);
-typedef void (usb_bus_mem_cb_t)(struct usb_bus *bus, usb_bus_mem_sub_cb_t *scb);
+typedef void	(usb_bus_mem_sub_callback_t)(struct usb_bus *,
+		    struct usb_page_cache *, struct usb_page *, usb_size_t,
+		    usb_size_t);
+typedef void	(usb_bus_mem_callback_t)(struct usb_bus *,
+		    usb_bus_mem_sub_callback_t *);
 
 /*
  * The following structure is used to define all the USB BUS
@@ -190,9 +193,10 @@ struct usb_temp_setup {
 
 /* prototypes */
 
-void	usb_bus_mem_flush_all(struct usb_bus *bus, usb_bus_mem_cb_t *cb);
-uint8_t	usb_bus_mem_alloc_all(struct usb_bus *bus, bus_dma_tag_t dmat, usb_bus_mem_cb_t *cb);
-void	usb_bus_mem_free_all(struct usb_bus *bus, usb_bus_mem_cb_t *cb);
+void	usb_bus_mem_flush_all(struct usb_bus *bus, usb_bus_mem_callback_t *cb);
+uint8_t	usb_bus_mem_alloc_all(struct usb_bus *bus, bus_dma_tag_t dmat,
+	    usb_bus_mem_callback_t *cb);
+void	usb_bus_mem_free_all(struct usb_bus *bus, usb_bus_mem_callback_t *cb);
 uint16_t usb_isoc_time_expand(struct usb_bus *bus, uint16_t isoc_time_curr);
 uint16_t usbd_fs_isoc_schedule_isoc_time_expand(struct usb_device *udev, struct usb_fs_isoc_schedule **pp_start, struct usb_fs_isoc_schedule **pp_end, uint16_t isoc_time);
 uint8_t	usbd_fs_isoc_schedule_alloc(struct usb_fs_isoc_schedule *fss, uint8_t *pstart, uint16_t len);



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201009110123.o8B1NOW6010745>