patch-2.4.21 linux-2.4.21/drivers/ieee1394/hosts.c

• Lines: 172
• Date: 2003-06-13 07:51:34.000000000 -0700
• Orig file: linux-2.4.20/drivers/ieee1394/hosts.c
• Orig date: 2002-11-28 15:53:13.000000000 -0800

diff -urN linux-2.4.20/drivers/ieee1394/hosts.c linux-2.4.21/drivers/ieee1394/hosts.c
@@ -21,12 +21,8 @@
 #include "ieee1394_core.h"
 #include "highlevel.h"
 
-static struct list_head hosts = LIST_HEAD_INIT(hosts);
-static struct list_head host_drivers = LIST_HEAD_INIT(host_drivers);
-
-spinlock_t hosts_lock = SPIN_LOCK_UNLOCKED;
-spinlock_t host_drivers_lock = SPIN_LOCK_UNLOCKED;
-
+LIST_HEAD(hpsb_hosts);
+DECLARE_MUTEX(hpsb_hosts_lock);
 
 static int dummy_transmit_packet(struct hpsb_host *h, struct hpsb_packet *p)
 {
@@ -38,9 +34,15 @@
         return -1;
 }
 
+static int dummy_isoctl(struct hpsb_iso *iso, enum isoctl_cmd command, unsigned long arg)
+{
+	return -1;
+}
+
 static struct hpsb_host_driver dummy_driver = {
         .transmit_packet = dummy_transmit_packet,
-        .devctl =          dummy_devctl
+        .devctl =          dummy_devctl,
+	.isoctl =          dummy_isoctl
 };
 
 /**
@@ -57,11 +59,10 @@
 int hpsb_ref_host(struct hpsb_host *host)
 {
         struct list_head *lh;
-	unsigned long flags;
         int retval = 0;
 
-        spin_lock_irqsave(&hosts_lock, flags);
-        list_for_each(lh, &hosts) {
+	down(&hpsb_hosts_lock);
+        list_for_each(lh, &hpsb_hosts) {
                 if (host == list_entry(lh, struct hpsb_host, host_list)) {
                         host->driver->devctl(host, MODIFY_USAGE, 1);
 			host->refcount++;
@@ -69,7 +70,7 @@
 			break;
         	}
         }
-        spin_unlock_irqrestore(&hosts_lock, flags);
+	up(&hpsb_hosts_lock);
 
         return retval;
 }
@@ -85,16 +86,14 @@
 
 void hpsb_unref_host(struct hpsb_host *host)
 {
-        unsigned long flags;
-
         host->driver->devctl(host, MODIFY_USAGE, 0);
 
-        spin_lock_irqsave(&hosts_lock, flags);
+	down(&hpsb_hosts_lock);
         host->refcount--;
 
         if (!host->refcount && host->is_shutdown)
                 kfree(host);
-        spin_unlock_irqrestore(&hosts_lock, flags);
+	up(&hpsb_hosts_lock);
 }
 
 /**
@@ -121,6 +120,7 @@
 struct hpsb_host *hpsb_alloc_host(struct hpsb_host_driver *drv, size_t extra)
 {
         struct hpsb_host *h;
+	int i;
 
         h = kmalloc(sizeof(struct hpsb_host) + extra, SLAB_KERNEL);
         if (!h) return NULL;
@@ -133,8 +133,8 @@
         INIT_LIST_HEAD(&h->pending_packets);
         spin_lock_init(&h->pending_pkt_lock);
 
-        sema_init(&h->tlabel_count, 64);
-        spin_lock_init(&h->tlabel_lock);
+	for (i = 0; i < ARRAY_SIZE(h->tpool); i++)
+		HPSB_TPOOL_INIT(&h->tpool[i]);
 
 	atomic_set(&h->generation, 0);
 
@@ -146,43 +146,50 @@
 	return h;
 }
 
-void hpsb_add_host(struct hpsb_host *host)
+static int alloc_hostnum(void)
 {
-        unsigned long flags;
+	int hostnum = 0;
 
-        spin_lock_irqsave(&hosts_lock, flags);
-        list_add_tail(&host->host_list, &hosts);
-        spin_unlock_irqrestore(&hosts_lock, flags);
+	while (1) {
+		struct list_head *lh;
+		int found = 0;
 
-        highlevel_add_host(host);
-        host->driver->devctl(host, RESET_BUS, 0);
+		list_for_each(lh, &hpsb_hosts) {
+			struct hpsb_host *host = list_entry(lh, struct hpsb_host, host_list);
+
+			if (host->id == hostnum) {
+				found = 1;
+				break;
+			}
+		}
+
+		if (!found)
+			return hostnum;
+
+		hostnum++;
+	}
+
+	return 0;
 }
 
-void hpsb_remove_host(struct hpsb_host *host)
+void hpsb_add_host(struct hpsb_host *host)
 {
-        unsigned long flags;
+	down(&hpsb_hosts_lock);
+	host->id = alloc_hostnum();
+        list_add_tail(&host->host_list, &hpsb_hosts);
+	up(&hpsb_hosts_lock);
 
-        host->is_shutdown = 1;
-        host->driver = &dummy_driver;
-        highlevel_remove_host(host);
-
-        spin_lock_irqsave(&hosts_lock, flags);
-        list_del(&host->host_list);
-        spin_unlock_irqrestore(&hosts_lock, flags);
+        highlevel_add_host(host);
+        host->driver->devctl(host, RESET_BUS, LONG_RESET);
 }
 
-/*
- * This function calls the given function for every host currently registered.
- */
-void hl_all_hosts(void (*function)(struct hpsb_host*))
+void hpsb_remove_host(struct hpsb_host *host)
 {
-        struct list_head *lh;
-        struct hpsb_host *host;
+	down(&hpsb_hosts_lock);
+        host->is_shutdown = 1;
+        host->driver = &dummy_driver;
+	list_del(&host->host_list);
+	up(&hpsb_hosts_lock);
 
-        spin_lock_irq(&hosts_lock);
-        list_for_each (lh, &hosts) {
-                host = list_entry(lh, struct hpsb_host, host_list);
-                function(host);
-	}
-        spin_unlock_irq(&hosts_lock);
+        highlevel_remove_host(host);
 }