xpp: start migration from procfs to sysfs.

* Sysfs representation for XPDs:
  /sys/bus/xpds/devices/<bus>:<unit>:<subunit>
* Astribanks sysfs directories now include the XPDs as subdirectories:
  e.g. /sys/bus/astribanks/devices/xbus-00/00:3:0
* procfs control interface deprecated: conditioned by OLD_PROC
  (defaults to off). Control functionality moved to sysfs:
* xbus attributes: cls connector label status timing waitfor_xpds xbus_state
* XPDs can have driver-specific attributes. Common attriubtes:
  blink chipregs span
* PRI-specific attributes:
  pri_clocking pri_dchan pri_cas pri_alarms pri_layer1 pri_localloop pri_protocol
* The Astribank attribute "xbus_state" is read/write. Reading it shows
  the current state of the Astribank. Writing "start" or "stop" allows a
  software equivalent of connect or disconnect respectively.
* When an Astribank is ready it sends an "online" event. Whenever its
  not ready (e.g. at the time of disconnect) it sends an "offline" event.
  Use astribank_hook.sample to handle those.



git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@5097 a0bf4364-ded3-4de4-8d8a-66a801d63aff

1 files changed, 14 insertions, 26 deletions

diff --git a/drivers/dahdi/xpp/xpp_usb.c b/drivers/dahdi/xpp/xpp_usb.c
index a64a50c..2346fb4 100644
--- a/drivers/dahdi/xpp/xpp_usb.c
+++ b/drivers/dahdi/xpp/xpp_usb.c
@@ -439,7 +439,7 @@ static int xframe_send_cmd(xbus_t *xbus, xframe_t *xframe)
  */
 static bool xusb_listen(xusb_t *xusb)
 {
-	xbus_t			*xbus = get_xbus(xusb->xbus_num);
+	xbus_t			*xbus = xbus_num(xusb->xbus_num);
 	xframe_t		*xframe;
 	struct uframe		*uframe;
 	int			ret = 0;
@@ -465,7 +465,6 @@ static bool xusb_listen(xusb_t *xusb)
 	atomic_inc(&xusb->pending_reads);
 	ret = 1;
 out:
-	put_xbus(xbus);
 	return ret;
 }
 
@@ -710,7 +709,7 @@ static int xusb_probe(struct usb_interface *interface, const struct usb_device_i
 	xusb->present = 1;
 
 	/* we can register the device now, as it is ready */
-	usb_set_intfdata (interface, xusb);
+	usb_set_intfdata(interface, xusb);
 	retval = usb_register_dev (interface, &xusb_class);
 	if (retval) {
 		/* something prevented us from registering this driver */
@@ -739,12 +738,12 @@ static int xusb_probe(struct usb_interface *interface, const struct usb_device_i
 		goto probe_failed;
 	}
 	usb_make_path(udev, xusb->path, XBUS_DESCLEN);	// May trunacte... ignore
-	snprintf(xbus->location, XBUS_DESCLEN, "%s", xusb->path);
+	snprintf(xbus->connector, XBUS_DESCLEN, "%s", xusb->path);
 	if(xusb->serial && xusb->serial[0])
 		snprintf(xbus->label, LABEL_SIZE, "usb:%s", xusb->serial);
 	xusb->index = i;
 	xusb_array[i] = xusb;
-	XUSB_DBG(DEVICES, xusb, "GOT XPP USB BUS: %s\n", xbus->location);
+	XUSB_DBG(DEVICES, xusb, "GOT XPP USB BUS: %s\n", xbus->connector);
 
 #ifdef CONFIG_PROC_FS
 	DBG(PROC, "Creating proc entry " PROC_USBXPP_SUMMARY " in bus proc dir.\n");
@@ -763,11 +762,11 @@ static int xusb_probe(struct usb_interface *interface, const struct usb_device_i
 	/* prepare several pending frames for receive side */
 	for(i = 0; i < 10; i++)
 			xusb_listen(xusb);
-	xbus_activate(xbus);
+	xbus_connect(xbus);
 	return retval;
 probe_failed:
 	ERR("Failed to initialize xpp usb bus: %d\n", retval);
-	usb_set_intfdata (interface, NULL);
+	usb_set_intfdata(interface, NULL);
 	if(xusb) {
 		if(xusb->minor) {	// passed registration phase
 			ERR("Calling usb_deregister_dev()\n");
@@ -801,18 +800,20 @@ probe_failed:
  */
 static void xusb_disconnect(struct usb_interface *interface)
 {
+	struct usb_host_interface	*iface_desc = usb_altnum_to_altsetting(interface, 0);
 	xusb_t			*xusb;
 	xbus_t			*xbus;
 	int			minor;
 	int			i;
 
-	DBG(DEVICES, "CALLED\n");
+	DBG(DEVICES, "CALLED on interface #%d\n", iface_desc->desc.bInterfaceNumber);
 	/* prevent races with open() */
 	down (&disconnect_sem);
 
-	xusb = usb_get_intfdata (interface);
+	xusb = usb_get_intfdata(interface);
+	usb_set_intfdata(interface, NULL);
 	xusb->present = 0;
-	xbus = get_xbus(xusb->xbus_num);
+	xbus = xbus_num(xusb->xbus_num);
 
 	/* find our xusb */
 	for(i = 0; i < MAX_BUSES; i++) {
@@ -828,17 +829,13 @@ static void xusb_disconnect(struct usb_interface *interface)
 		remove_proc_entry(PROC_USBXPP_SUMMARY, xbus->proc_xbus_dir);
 	}
 #endif
-	/*
-	 * put_xbus() would be called during xbus_disconnect()
-	 */
 	xbus_disconnect(xbus);		// Blocking until fully deactivated!
-	usb_set_intfdata (interface, NULL);
 
 	down (&xusb->sem);
 	minor = xusb->minor;
 
 	/* give back our minor */
-	usb_deregister_dev (interface, &xusb_class);
+	usb_deregister_dev(interface, &xusb_class);
 
 	up (&xusb->sem);
 	DBG(DEVICES, "Semaphore released\n");
@@ -853,7 +850,7 @@ static void xpp_send_callback(USB_PASS_CB(urb))
 	struct uframe	*uframe = urb_to_uframe(urb);
 	xframe_t	*xframe = &uframe->xframe;
 	xusb_t		*xusb = uframe->xusb;
-	xbus_t		*xbus = get_xbus(xusb->xbus_num);
+	xbus_t		*xbus = xbus_num(xusb->xbus_num);
 	struct timeval	now;
 	long		usec;
 	int		writes = atomic_read(&xusb->pending_writes);
@@ -904,7 +901,6 @@ static void xpp_send_callback(USB_PASS_CB(urb))
 	FREE_SEND_XFRAME(xbus, xframe);
 	if(!xusb->present)
 		XUSB_ERR(xusb, "A urb from non-connected device?\n");
-	put_xbus(xbus);
 }
 
 static void xpp_receive_callback(USB_PASS_CB(urb))
@@ -912,7 +908,7 @@ static void xpp_receive_callback(USB_PASS_CB(urb))
 	struct uframe	*uframe = urb_to_uframe(urb);
 	xframe_t	*xframe = &uframe->xframe;
 	xusb_t		*xusb = uframe->xusb;
-	xbus_t		*xbus = get_xbus(xusb->xbus_num);
+	xbus_t		*xbus = xbus_num(xusb->xbus_num);
 	size_t		size;
 	bool		do_resubmit = 1;
 	bool		is_inuse = 0;
@@ -924,11 +920,6 @@ static void xpp_receive_callback(USB_PASS_CB(urb))
 		XUSB_ERR(xusb, "Received URB does not belong to a valid xbus anymore...\n");
 		return;
 	}
-	if(!XBUS_GET(xbus)) {
-		XUSB_ERR(xusb, "Dropping urb. Is shutting down.\n");
-		do_resubmit = 0;
-		goto err;
-	}
 	is_inuse = 1;
 	if(!xusb->present) {
 		do_resubmit = 0;
@@ -957,11 +948,8 @@ static void xpp_receive_callback(USB_PASS_CB(urb))
 	/* Send UP */
 	xbus_receive_xframe(xbus, xframe);
 end:
-	if(is_inuse)
-		XBUS_PUT(xbus);
 	if(do_resubmit)
 		xusb_listen(xusb);
-	put_xbus(xbus);
 	return;
 err:
 	FREE_RECV_XFRAME(xbus, xframe);