Thu Dec 4 06:57:29 2014 UTC ()
Remove unused and commented out sc_dma_reserve


(skrll)
diff -r1.4 -r1.4.12.1 src/sys/dev/usb/xhcivar.h
cvs diff -r1.4 -r1.4.12.1 src/sys/dev/usb/xhcivar.h (expand / switch to unified diff)

--- src/sys/dev/usb/xhcivar.h 2014/03/10 13:12:02 1.4
+++ src/sys/dev/usb/xhcivar.h 2014/12/04 06:57:29 1.4.12.1
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: xhcivar.h,v 1.4 2014/03/10 13:12:02 skrll Exp $ */ 1/* $NetBSD: xhcivar.h,v 1.4.12.1 2014/12/04 06:57:29 skrll Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2013 Jonathan A. Kollasch 4 * Copyright (c) 2013 Jonathan A. Kollasch
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer. 11 * notice, this list of conditions and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright 12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the 13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution. 14 * documentation and/or other materials provided with the distribution.
@@ -93,28 +93,26 @@ struct xhci_softc { @@ -93,28 +93,26 @@ struct xhci_softc {
93 int sc_ss_port_start; 93 int sc_ss_port_start;
94 int sc_ss_port_count; 94 int sc_ss_port_count;
95 95
96 struct xhci_slot * sc_slots; 96 struct xhci_slot * sc_slots;
97 97
98 struct xhci_ring sc_cr; /* command ring */ 98 struct xhci_ring sc_cr; /* command ring */
99 struct xhci_ring sc_er; /* event ring */ 99 struct xhci_ring sc_er; /* event ring */
100 100
101 usb_dma_t sc_eventst_dma; 101 usb_dma_t sc_eventst_dma;
102 usb_dma_t sc_dcbaa_dma; 102 usb_dma_t sc_dcbaa_dma;
103 usb_dma_t sc_spbufarray_dma; 103 usb_dma_t sc_spbufarray_dma;
104 usb_dma_t *sc_spbuf_dma; 104 usb_dma_t *sc_spbuf_dma;
105 105
106 //struct usb_dma_reserve sc_dma_reserve; 
107 
108 kcondvar_t sc_command_cv; 106 kcondvar_t sc_command_cv;
109 bus_addr_t sc_command_addr; 107 bus_addr_t sc_command_addr;
110 struct xhci_trb sc_result_trb; 108 struct xhci_trb sc_result_trb;
111 109
112 bool sc_ac64; 110 bool sc_ac64;
113 bool sc_dying; 111 bool sc_dying;
114 112
115 uint8_t sc_addr; 113 uint8_t sc_addr;
116 uint8_t sc_conf; 114 uint8_t sc_conf;
117}; 115};
118 116
119int xhci_init(struct xhci_softc *); 117int xhci_init(struct xhci_softc *);
120int xhci_intr(void *); 118int xhci_intr(void *);