Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Adding breaktrace & disabling timer migration"
[kvmfornfv.git]
/
qemu
/
hw
/
bt
/
hci-csr.c
diff --git
a/qemu/hw/bt/hci-csr.c
b/qemu/hw/bt/hci-csr.c
index
7b9b916
..
2e970b6
100644
(file)
--- a/
qemu/hw/bt/hci-csr.c
+++ b/
qemu/hw/bt/hci-csr.c
@@
-18,6
+18,7
@@
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "qemu-common.h"
#include "sysemu/char.h"
#include "qemu/timer.h"
#include "qemu-common.h"
#include "sysemu/char.h"
#include "qemu/timer.h"
@@
-362,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;
switch (cmd) {
case CHR_IOCTL_SERIAL_SET_PARAMS:
ssp = (QEMUSerialSetParams *) arg;
- s->baud_delay =
get_ticks_per_sec()
/ ssp->speed;
+ s->baud_delay =
NANOSECONDS_PER_SECOND
/ ssp->speed;
/* Moments later... (but shorter than 100ms) */
s->modem_state |= CHR_TIOCM_CTS;
break;
/* Moments later... (but shorter than 100ms) */
s->modem_state |= CHR_TIOCM_CTS;
break;
@@
-388,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->out_len = 0;
s->out_size = FIFO_LEN;
s->in_len = 0;
- s->baud_delay =
get_ticks_per_sec()
;
+ s->baud_delay =
NANOSECONDS_PER_SECOND
;
s->enable = 0;
s->in_hdr = INT_MAX;
s->in_data = INT_MAX;
s->enable = 0;
s->in_hdr = INT_MAX;
s->in_data = INT_MAX;