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 /sys | |
| parent | ad82110dcd80d02c817b387eb585ff1f516e93e9 (diff) | |
Notes
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/firewire/firewire.h | 1 | ||||
| -rw-r--r-- | sys/dev/firewire/fwdev.c | 5 | ||||
| -rw-r--r-- | sys/dev/firewire/fwohcireg.h | 15 |
3 files changed, 8 insertions, 13 deletions
diff --git a/sys/dev/firewire/firewire.h b/sys/dev/firewire/firewire.h index 032e59be716a..656c5f479e71 100644 --- a/sys/dev/firewire/firewire.h +++ b/sys/dev/firewire/firewire.h @@ -544,7 +544,6 @@ struct fw_crom_buf { #define FW_SBINDADDR _IOWR('S', 3, struct fw_asybindreq) #define FW_CBINDADDR _IOWR('S', 4, struct fw_asybindreq) #define FW_GTPMAP _IOR('S', 5, struct fw_topology_map) -#define FW_GSPMAP _IOW('S', 6, struct fw_speed_map *) #define FW_GCROM _IOWR('S', 7, struct fw_crom_buf) #define FWOHCI_RDREG _IOWR('S', 80, struct fw_reg_req_t) diff --git a/sys/dev/firewire/fwdev.c b/sys/dev/firewire/fwdev.c index ae8a7009450f..1c9a70d705da 100644 --- a/sys/dev/firewire/fwdev.c +++ b/sys/dev/firewire/fwdev.c @@ -832,11 +832,6 @@ error: bcopy(sc->fc->topology_map, data, (sc->fc->topology_map->crc_len + 1) * 4); break; - case FW_GSPMAP: - /* speed_map is larger than a page */ - err = copyout(sc->fc->speed_map, *(void **)data, - (sc->fc->speed_map->crc_len + 1) * 4); - break; case FW_GCROM: for (fwdev = TAILQ_FIRST(&sc->fc->devices); fwdev != NULL; fwdev = TAILQ_NEXT(fwdev, link)) { diff --git a/sys/dev/firewire/fwohcireg.h b/sys/dev/firewire/fwohcireg.h index 1f874eedb9fb..572370d2f454 100644 --- a/sys/dev/firewire/fwohcireg.h +++ b/sys/dev/firewire/fwohcireg.h @@ -172,13 +172,14 @@ struct ohci_registers { fwohcireg_t dummy1[3]; /* dummy 0x44-0x4c */ fwohcireg_t hcc_cntl_set; /* HCC control set 0x50 */ fwohcireg_t hcc_cntl_clr; /* HCC control clr 0x54 */ -#define OHCI_HCC_BIGEND (1 << 30) -#define OHCI_HCC_PRPHY (1 << 23) -#define OHCI_HCC_PHYEN (1 << 22) -#define OHCI_HCC_LPS (1 << 19) -#define OHCI_HCC_POSTWR (1 << 18) -#define OHCI_HCC_LINKEN (1 << 17) -#define OHCI_HCC_RESET (1 << 16) +#define OHCI_HCC_BIBIV (1 << 31) /* BIBimage Valid */ +#define OHCI_HCC_BIGEND (1 << 30) /* noByteSwapData */ +#define OHCI_HCC_PRPHY (1 << 23) /* programPhyEnable */ +#define OHCI_HCC_PHYEN (1 << 22) /* aPhyEnhanceEnable */ +#define OHCI_HCC_LPS (1 << 19) /* LPS */ +#define OHCI_HCC_POSTWR (1 << 18) /* postedWriteEnable */ +#define OHCI_HCC_LINKEN (1 << 17) /* linkEnable */ +#define OHCI_HCC_RESET (1 << 16) /* softReset */ fwohcireg_t dummy2[2]; /* dummy 0x58-0x5c */ fwohcireg_t dummy3[1]; /* dummy 0x60 */ fwohcireg_t sid_buf; /* self id buffer 0x64 */ |