| @@ -1,14 +1,14 @@ | | | @@ -1,14 +1,14 @@ |
1 | /* $NetBSD: uhcireg.h,v 1.19.66.3 2015/09/22 12:06:01 skrll Exp $ */ | | 1 | /* $NetBSD: uhcireg.h,v 1.19.66.4 2015/11/07 08:10:40 skrll Exp $ */ |
2 | /* $FreeBSD: src/sys/dev/usb/uhcireg.h,v 1.12 1999/11/17 22:33:42 n_hibma Exp $ */ | | 2 | /* $FreeBSD: src/sys/dev/usb/uhcireg.h,v 1.12 1999/11/17 22:33:42 n_hibma Exp $ */ |
3 | | | 3 | |
4 | /* | | 4 | /* |
5 | * Copyright (c) 1998 The NetBSD Foundation, Inc. | | 5 | * Copyright (c) 1998 The NetBSD Foundation, Inc. |
6 | * All rights reserved. | | 6 | * All rights reserved. |
7 | * | | 7 | * |
8 | * This code is derived from software contributed to The NetBSD Foundation | | 8 | * This code is derived from software contributed to The NetBSD Foundation |
9 | * by Lennart Augustsson (lennart@augustsson.net) at | | 9 | * by Lennart Augustsson (lennart@augustsson.net) at |
10 | * Carlstedt Research & Technology. | | 10 | * Carlstedt Research & Technology. |
11 | * | | 11 | * |
12 | * Redistribution and use in source and binary forms, with or without | | 12 | * Redistribution and use in source and binary forms, with or without |
13 | * modification, are permitted provided that the following conditions | | 13 | * modification, are permitted provided that the following conditions |
14 | * are met: | | 14 | * are met: |
| @@ -147,26 +147,27 @@ typedef struct { | | | @@ -147,26 +147,27 @@ typedef struct { |
147 | volatile uhci_physaddr_t td_link; | | 147 | volatile uhci_physaddr_t td_link; |
148 | volatile uint32_t td_status; | | 148 | volatile uint32_t td_status; |
149 | #define UHCI_TD_ACTLEN_MASK __BITS(10,0) | | 149 | #define UHCI_TD_ACTLEN_MASK __BITS(10,0) |
150 | #define UHCI_TD_GET_ACTLEN(s) \ | | 150 | #define UHCI_TD_GET_ACTLEN(s) \ |
151 | ((__SHIFTOUT((s), UHCI_TD_ACTLEN_MASK) + 1) & __SHIFTOUT_MASK(UHCI_TD_ACTLEN_MASK)) | | 151 | ((__SHIFTOUT((s), UHCI_TD_ACTLEN_MASK) + 1) & __SHIFTOUT_MASK(UHCI_TD_ACTLEN_MASK)) |
152 | #define UHCI_TD_ZERO_ACTLEN(t) ((t) | 0x3ff) | | 152 | #define UHCI_TD_ZERO_ACTLEN(t) ((t) | 0x3ff) |
153 | #define UHCI_TD_BITSTUFF __BIT(17) | | 153 | #define UHCI_TD_BITSTUFF __BIT(17) |
154 | #define UHCI_TD_CRCTO __BIT(18) | | 154 | #define UHCI_TD_CRCTO __BIT(18) |
155 | #define UHCI_TD_NAK __BIT(19) | | 155 | #define UHCI_TD_NAK __BIT(19) |
156 | #define UHCI_TD_BABBLE __BIT(20) | | 156 | #define UHCI_TD_BABBLE __BIT(20) |
157 | #define UHCI_TD_DBUFFER __BIT(21) | | 157 | #define UHCI_TD_DBUFFER __BIT(21) |
158 | #define UHCI_TD_STALLED __BIT(22) | | 158 | #define UHCI_TD_STALLED __BIT(22) |
159 | #define UHCI_TD_ACTIVE __BIT(23) | | 159 | #define UHCI_TD_ACTIVE __BIT(23) |
| | | 160 | #define UHCI_TD_STATUS_MASK __BITS(16,23) |
160 | #define UHCI_TD_IOC __BIT(24) | | 161 | #define UHCI_TD_IOC __BIT(24) |
161 | #define UHCI_TD_IOS __BIT(25) | | 162 | #define UHCI_TD_IOS __BIT(25) |
162 | #define UHCI_TD_LS __BIT(26) | | 163 | #define UHCI_TD_LS __BIT(26) |
163 | #define UHCI_TD_ERRCNT_MASK __BITS(28,27) | | 164 | #define UHCI_TD_ERRCNT_MASK __BITS(28,27) |
164 | #define UHCI_TD_GET_ERRCNT(s) __SHIFTOUT((s), UHCI_TD_ERRCNT_MASK) | | 165 | #define UHCI_TD_GET_ERRCNT(s) __SHIFTOUT((s), UHCI_TD_ERRCNT_MASK) |
165 | #define UHCI_TD_SET_ERRCNT(n) __SHIFTIN((n), UHCI_TD_ERRCNT_MASK) | | 166 | #define UHCI_TD_SET_ERRCNT(n) __SHIFTIN((n), UHCI_TD_ERRCNT_MASK) |
166 | #define UHCI_TD_SPD __BIT(29) | | 167 | #define UHCI_TD_SPD __BIT(29) |
167 | volatile uint32_t td_token; | | 168 | volatile uint32_t td_token; |
168 | #define UHCI_TD_PID_IN 0x69 | | 169 | #define UHCI_TD_PID_IN 0x69 |
169 | #define UHCI_TD_PID_OUT 0xe1 | | 170 | #define UHCI_TD_PID_OUT 0xe1 |
170 | #define UHCI_TD_PID_SETUP 0x2d | | 171 | #define UHCI_TD_PID_SETUP 0x2d |
171 | #define UHCI_TD_PID_MASK __BITS(7,0) | | 172 | #define UHCI_TD_PID_MASK __BITS(7,0) |
172 | #define UHCI_TD_SET_PID(p) __SHIFTIN((p), UHCI_TD_PID_MASK) | | 173 | #define UHCI_TD_SET_PID(p) __SHIFTIN((p), UHCI_TD_PID_MASK) |