refresh

diff --git a/meta b/meta
index cf55d17ef077eec1a9f24e0fff8696796e266ad1..d69cf8b7a60826029a051516606fd080d494ed2b 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 6a9c19f1e98431bc713e4871c7471f6399c5573b
-Head: 79491d7ed43c18cae32f26665c9298c25d92e7c8
+Previous: 039625c13b23ece4e143d55e838311c975050f48
+Head: 8de02c47fbf595132105a7050ad6f755f49f9a7a
 Applied:
   lmc: b355854c79a1e446e87684a41663ad5aae258b73
   lid: 1c005908ee6c257f6fa290df8ce8a45e968d07ab
@@ -8,7 +8,6 @@ Applied:
   range: dfe3c8409e2e1fcc2fc11bd7f9287f1c46b36015
   format_lid: 8994e17d78c86c08edcc8067dda7392a97cc8a3f
   query_path: f26d98116f57bcead2f61462602b4776c12a0aae
-  addr_size: 12ef41d4c6e6425243b4b81103012028caeaa738
-  refresh-temp: 79491d7ed43c18cae32f26665c9298c25d92e7c8
+  addr_size: 8de02c47fbf595132105a7050ad6f755f49f9a7a
 Unapplied:
 Hidden:

diff --git a/patches/addr_size b/patches/addr_size
index 0b1471c54a6e719bdd03ed171503b5aa0d4229db..0f7f6e679bd6ea724604f56544222e2f2e92f1f9 100644 (file)
--- a/patches/addr_size
+++ b/patches/addr_size
@@ -1,5 +1,5 @@
 Bottom: a8e8aa49b3591176bc809c876eb5943ae719ce0d
-Top:    a8e8aa49b3591176bc809c876eb5943ae719ce0d
+Top:    751bb64c882bec91cf7294f667963cc1e8bbd7ff
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-12-17 14:30:40 -0800
 
@@ -18,4 +18,55 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
-
+diff --git a/src/acm.c b/src/acm.c
+index 1f3c470..051496c 100644
+--- a/src/acm.c
++++ b/src/acm.c
+@@ -308,7 +308,7 @@ acm_init_dest(struct acm_dest *dest, uint8_t addr_type, uint8_t *addr, size_t si
+ }
+ 
+ static struct acm_dest *
+-acm_alloc_dest(uint8_t addr_type, uint8_t *addr)
++acm_alloc_dest(uint8_t addr_type, uint8_t *addr, size_t size)
+ {
+       struct acm_dest *dest;
+ 
+@@ -318,14 +318,14 @@ acm_alloc_dest(uint8_t addr_type, uint8_t *addr)
+               return NULL;
+       }
+ 
+-      acm_init_dest(dest, addr_type, addr, ACM_MAX_ADDRESS);
++      acm_init_dest(dest, addr_type, addr, size);
+       acm_log(1, "%s\n", dest->name);
+       return dest;
+ }
+ 
+ /* Caller must hold ep lock. */
+ static struct acm_dest *
+-acm_get_dest(struct acm_ep *ep, uint8_t addr_type, uint8_t *addr)
++acm_get_dest(struct acm_ep *ep, uint8_t addr_type, uint8_t *addr, size_t size)
+ {
+       struct acm_dest *dest, **tdest;
+ 
+@@ -353,17 +353,17 @@ acm_put_dest(struct acm_dest *dest)
+ }
+ 
+ static struct acm_dest *
+-acm_acquire_dest(struct acm_ep *ep, uint8_t addr_type, uint8_t *addr)
++acm_acquire_dest(struct acm_ep *ep, uint8_t addr_type, uint8_t *addr, size_t size)
+ {
+       struct acm_dest *dest;
+ 
+       acm_format_name(2, log_data, sizeof log_data,
+-                      addr_type, addr, ACM_MAX_ADDRESS);
++                      addr_type, addr, size);
+       acm_log(2, "%s\n", log_data);
+       lock_acquire(&ep->lock);
+-      dest = acm_get_dest(ep, addr_type, addr);
++      dest = acm_get_dest(ep, addr_type, addr, size);
+       if (!dest) {
+-              dest = acm_alloc_dest(addr_type, addr);
++              dest = acm_alloc_dest(addr_type, addr, size);
+               if (dest) {
+                       tsearch(dest, &ep->dest_map[addr_type - 1], acm_compare_dest);
+                       (void) atomic_inc(&dest->refcnt);

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index ee5065f..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,61 +0,0 @@
-Bottom: a8e8aa49b3591176bc809c876eb5943ae719ce0d
-Top:    751bb64c882bec91cf7294f667963cc1e8bbd7ff
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-12-17 14:33:29 -0800
-
-Refresh of addr_size
-
----
-
-diff --git a/src/acm.c b/src/acm.c
-index 1f3c470..051496c 100644
---- a/src/acm.c
-+++ b/src/acm.c
-@@ -308,7 +308,7 @@ acm_init_dest(struct acm_dest *dest, uint8_t addr_type, uint8_t *addr, size_t si
- }
- 
- static struct acm_dest *
--acm_alloc_dest(uint8_t addr_type, uint8_t *addr)
-+acm_alloc_dest(uint8_t addr_type, uint8_t *addr, size_t size)
- {
-       struct acm_dest *dest;
- 
-@@ -318,14 +318,14 @@ acm_alloc_dest(uint8_t addr_type, uint8_t *addr)
-               return NULL;
-       }
- 
--      acm_init_dest(dest, addr_type, addr, ACM_MAX_ADDRESS);
-+      acm_init_dest(dest, addr_type, addr, size);
-       acm_log(1, "%s\n", dest->name);
-       return dest;
- }
- 
- /* Caller must hold ep lock. */
- static struct acm_dest *
--acm_get_dest(struct acm_ep *ep, uint8_t addr_type, uint8_t *addr)
-+acm_get_dest(struct acm_ep *ep, uint8_t addr_type, uint8_t *addr, size_t size)
- {
-       struct acm_dest *dest, **tdest;
- 
-@@ -353,17 +353,17 @@ acm_put_dest(struct acm_dest *dest)
- }
- 
- static struct acm_dest *
--acm_acquire_dest(struct acm_ep *ep, uint8_t addr_type, uint8_t *addr)
-+acm_acquire_dest(struct acm_ep *ep, uint8_t addr_type, uint8_t *addr, size_t size)
- {
-       struct acm_dest *dest;
- 
-       acm_format_name(2, log_data, sizeof log_data,
--                      addr_type, addr, ACM_MAX_ADDRESS);
-+                      addr_type, addr, size);
-       acm_log(2, "%s\n", log_data);
-       lock_acquire(&ep->lock);
--      dest = acm_get_dest(ep, addr_type, addr);
-+      dest = acm_get_dest(ep, addr_type, addr, size);
-       if (!dest) {
--              dest = acm_alloc_dest(addr_type, addr);
-+              dest = acm_alloc_dest(addr_type, addr, size);
-               if (dest) {
-                       tsearch(dest, &ep->dest_map[addr_type - 1], acm_compare_dest);
-                       (void) atomic_inc(&dest->refcnt);