Line 0
Link Here
|
|
|
1 |
--- os_freebsd.cpp 2012-05-31 17:43:19.000000000 +0400 |
2 |
+++ os_freebsd.cpp 2012-05-31 17:45:44.000000000 +0400 |
3 |
@@ -1749,8 +1769,7 @@ |
4 |
if (ccb.cdm.matches[i].type == DEV_MATCH_BUS) { |
5 |
bus_result = &ccb.cdm.matches[i].result.bus_result; |
6 |
|
7 |
- if (strcmp(bus_result->dev_name,"ata") == 0 /* ATAPICAM devices will be probed as ATA devices, skip'em there */ |
8 |
- || strcmp(bus_result->dev_name,"xpt") == 0) /* skip XPT bus at all */ |
9 |
+ if (strcmp(bus_result->dev_name,"xpt") == 0) /* skip XPT bus at all */ |
10 |
skip_bus = 1; |
11 |
else |
12 |
skip_bus = 0; |
13 |
@@ -1773,8 +1792,10 @@ |
14 |
* We are searching for latest name |
15 |
*/ |
16 |
periph_result = &ccb.cdm.matches[i].result.periph_result; |
17 |
- devname = strprintf("%s%s%d", _PATH_DEV, periph_result->periph_name, periph_result->unit_number); |
18 |
- changed = 0; |
19 |
+ if (strcmp(periph_result->periph_name, "pass")) { |
20 |
+ devname = strprintf("%s%s%d", _PATH_DEV, periph_result->periph_name, periph_result->unit_number); |
21 |
+ changed = 0; |
22 |
+ } |
23 |
}; |
24 |
if ((changed == 1 || show_all) && !devname.empty()) { |
25 |
names.push_back(devname); |