diff options
author | Hidetoshi Shimokawa <simokawa@FreeBSD.org> | 2003-01-04 16:03:50 +0000 |
---|---|---|
committer | Hidetoshi Shimokawa <simokawa@FreeBSD.org> | 2003-01-04 16:03:50 +0000 |
commit | bce5729a9d3db5d19a442491719d1d52d35c7c11 (patch) | |
tree | 23ab8a9494621a9332a1d6042b68b6a22f4a012d /usr.sbin | |
parent | ad82110dcd80d02c817b387eb585ff1f516e93e9 (diff) | |
download | src-bce5729a9d3db5d19a442491719d1d52d35c7c11.tar.gz src-bce5729a9d3db5d19a442491719d1d52d35c7c11.zip |
- Remove speed_map API because speed_map is obsoleted by 1394a.
- Add definition of OHCI_HCC_BIBIV in fwohcireg.h.
Notes
Notes:
svn path=/head/; revision=108662
Diffstat (limited to 'usr.sbin')
-rw-r--r-- | usr.sbin/fwcontrol/fwcontrol.8 | 4 | ||||
-rw-r--r-- | usr.sbin/fwcontrol/fwcontrol.c | 29 |
2 files changed, 3 insertions, 30 deletions
diff --git a/usr.sbin/fwcontrol/fwcontrol.8 b/usr.sbin/fwcontrol/fwcontrol.8 index 809389cff7d1..d29d2dd3cbd5 100644 --- a/usr.sbin/fwcontrol/fwcontrol.8 +++ b/usr.sbin/fwcontrol/fwcontrol.8 @@ -33,7 +33,7 @@ .Nd FireWire control utility .Sh SYNOPSIS .Nm -.Op Fl rts +.Op Fl rt .Op Fl c Ar node .Op Fl d Ar node .Op Fl l Ar file @@ -51,8 +51,6 @@ FireWire subsystem. Initiate bus reset. .It Fl t Show the topology map. -.It Fl s -Show the speed map. .It Fl c Ar node Show the configuration ROM on the node. .It Fl d Ar node diff --git a/usr.sbin/fwcontrol/fwcontrol.c b/usr.sbin/fwcontrol/fwcontrol.c index a7ed68cfafe2..c11ef4e86c20 100644 --- a/usr.sbin/fwcontrol/fwcontrol.c +++ b/usr.sbin/fwcontrol/fwcontrol.c @@ -54,13 +54,12 @@ static void usage(void) { printf("fwcontrol [-g gap_count] [-b pri_req] [-c node]" - " [-r] [-t] [-s] [-d node] [-l file]\n"); + " [-r] [-t] [-d node] [-l file]\n"); printf("\t-g: broadcast gap_count by phy_config packet\n"); printf("\t-b: set PRIORITY_BUDGET register on all supported nodes\n"); printf("\t-c: read configuration ROM\n"); printf("\t-r: bus reset\n"); printf("\t-t: read topology map\n"); - printf("\t-s: read speed map\n"); printf("\t-d: hex dump of configuration ROM\n"); printf("\t-l: load and parse hex dump file of configuration ROM\n"); exit(0); @@ -339,27 +338,6 @@ show_topology_map(int fd) free(tmap); } -static void -show_speed_map(int fd) -{ - struct fw_speed_map *smap; - int i,j; - - smap = malloc(sizeof(struct fw_speed_map)); - if (smap == NULL) - return; - if (ioctl(fd, FW_GSPMAP, &smap) < 0) { - err(1, "ioctl"); - } - printf("crc_len: %d generation:%d\n", smap->crc_len, smap->generation); - for (i = 0; i < 64; i ++) { - for (j = 0; j < 64; j ++) - printf("%d", smap->speed[i][j]); - printf("\n"); - } - free(smap); -} - int main(int argc, char **argv) { @@ -375,7 +353,7 @@ main(int argc, char **argv) usage(); } - while ((ch = getopt(argc, argv, "g:b:rtsc:d:l:")) != -1) + while ((ch = getopt(argc, argv, "g:b:rtc:d:l:")) != -1) switch(ch) { case 'g': /* gap count */ @@ -393,9 +371,6 @@ main(int argc, char **argv) case 't': show_topology_map(fd); break; - case 's': - show_speed_map(fd); - break; case 'c': tmp = strtol(optarg, NULL, 0); get_crom(fd, tmp, crom_buf, len); |