Rev 4070 | Rev 4119 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 4070 | Rev 4103 | ||
|---|---|---|---|
| Line 24... | Line 24... | ||
| 24 | * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
24 | * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 25 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
25 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
| 26 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 27 | */ |
27 | */ |
| 28 | 28 | ||
| 29 | /** @addtogroup sparc64 |
29 | /** @addtogroup sparc64 |
| 30 | * @{ |
30 | * @{ |
| 31 | */ |
31 | */ |
| 32 | /** @file |
32 | /** @file |
| 33 | */ |
33 | */ |
| 34 | 34 | ||
| Line 165... | Line 165... | ||
| 165 | #ifdef CONFIG_Z8530 |
165 | #ifdef CONFIG_Z8530 |
| 166 | case KBD_Z8530: |
166 | case KBD_Z8530: |
| 167 | devno = device_assign_devno(); |
167 | devno = device_assign_devno(); |
| 168 | z8530 = (z8530_t *) hw_map(aligned_addr, offset + size) + |
168 | z8530 = (z8530_t *) hw_map(aligned_addr, offset + size) + |
| 169 | offset; |
169 | offset; |
| - | 170 | ||
| - | 171 | indev_t *kbrdin = z8530_init(z8530, devno, inr, cir, cir_arg); |
|
| 170 | kbrd_init(stdin); |
172 | if (kbrdin) |
| 171 | (void) z8530_init(z8530, devno, inr, cir, cir_arg, &kbrdin); |
173 | kbrd_init(kbrdin); |
| 172 | 174 | ||
| 173 | /* |
175 | /* |
| 174 | * This is the necessary evil until the userspace drivers are |
176 | * This is the necessary evil until the userspace drivers are |
| 175 | * entirely self-sufficient. |
177 | * entirely self-sufficient. |
| 176 | */ |
178 | */ |
| Line 186... | Line 188... | ||
| 186 | #ifdef CONFIG_NS16550 |
188 | #ifdef CONFIG_NS16550 |
| 187 | case KBD_NS16550: |
189 | case KBD_NS16550: |
| 188 | devno = device_assign_devno(); |
190 | devno = device_assign_devno(); |
| 189 | ns16550 = (ns16550_t *) hw_map(aligned_addr, offset + size) + |
191 | ns16550 = (ns16550_t *) hw_map(aligned_addr, offset + size) + |
| 190 | offset; |
192 | offset; |
| 191 | kbrd_init(stdin); |
193 | |
| 192 | (void) ns16550_init(ns16550, devno, inr, cir, cir_arg, &kbrdin); |
194 | indev_t *kbrdin = ns16550_init(ns16550, devno, inr, cir, cir_arg); |
| - | 195 | if (kbrdin) |
|
| - | 196 | kbrd_init(kbrdin); |
|
| 193 | 197 | ||
| 194 | /* |
198 | /* |
| 195 | * This is the necessary evil until the userspace driver is |
199 | * This is the necessary evil until the userspace driver is |
| 196 | * entirely self-sufficient. |
200 | * entirely self-sufficient. |
| 197 | */ |
201 | */ |