Get rid of _t suffix

[mirror_qemu.git] / hw / bt-hci-csr.c

diff --git a/hw/bt-hci-csr.c b/hw/bt-hci-csr.c
index 62943ffdacb0ff469cfe5df9ccca2892408a9f9d..892801e00ae0c44ed3ce67e3017890106f5cb715 100644 (file)
--- a/hw/bt-hci-csr.c
+++ b/hw/bt-hci-csr.c
@@ -14,10 +14,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "qemu-common.h"
@@ -46,7 +44,7 @@ struct csrhci_s {
     QEMUTimer *out_tm;
     int64_t baud_delay;
 
-    bdaddr_t bd_addr;
+    a_bdaddr bd_addr;
     struct HCIInfo *hci;
 };
 
@@ -365,7 +363,7 @@ static int csrhci_ioctl(struct CharDriverState *chr, int cmd, void *arg)
     switch (cmd) {
     case CHR_IOCTL_SERIAL_SET_PARAMS:
         ssp = (QEMUSerialSetParams *) arg;
-        s->baud_delay = ticks_per_sec / ssp->speed;
+        s->baud_delay = get_ticks_per_sec() / ssp->speed;
         /* Moments later... (but shorter than 100ms) */
         s->modem_state |= CHR_TIOCM_CTS;
         break;
@@ -391,7 +389,7 @@ static void csrhci_reset(struct csrhci_s *s)
     s->out_len = 0;
     s->out_size = FIFO_LEN;
     s->in_len = 0;
-    s->baud_delay = ticks_per_sec;
+    s->baud_delay = get_ticks_per_sec();
     s->enable = 0;
     s->in_hdr = INT_MAX;
     s->in_data = INT_MAX;
@@ -400,7 +398,7 @@ static void csrhci_reset(struct csrhci_s *s)
     /* After a while... (but sooner than 10ms) */
     s->modem_state |= CHR_TIOCM_CTS;
 
-    memset(&s->bd_addr, 0, sizeof(bdaddr_t));
+    memset(&s->bd_addr, 0, sizeof(a_bdaddr));
 }
 
 static void csrhci_out_tick(void *opaque)