diff options
| author | David Turner <digit@android.com> | 2010-09-10 10:15:07 +0200 |
|---|---|---|
| committer | David 'Digit' Turner <digit@android.com> | 2010-09-13 00:30:34 -0700 |
| commit | a25351325187eb8eff8b9b090acd8f2d7684c6ff (patch) | |
| tree | a692498d0473066d512d5fc39ad1c6327cb6be81 /hw/bt-hci-csr.c | |
| parent | 2abe02c0511b2278af9386e7ac5e266d890a38b1 (diff) | |
| download | external_qemu-a25351325187eb8eff8b9b090acd8f2d7684c6ff.zip external_qemu-a25351325187eb8eff8b9b090acd8f2d7684c6ff.tar.gz external_qemu-a25351325187eb8eff8b9b090acd8f2d7684c6ff.tar.bz2 | |
upstream: minow hw updates.
Diffstat (limited to 'hw/bt-hci-csr.c')
| -rw-r--r-- | hw/bt-hci-csr.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/hw/bt-hci-csr.c b/hw/bt-hci-csr.c index 183441b..982577d 100644 --- a/hw/bt-hci-csr.c +++ b/hw/bt-hci-csr.c @@ -15,8 +15,7 @@ * 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., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * with this program; if not, see <http://www.gnu.org/licenses/>. */ #include "qemu-common.h" @@ -227,7 +226,7 @@ static void csrhci_in_packet(struct csrhci_s *s, uint8_t *pkt) *rpkt ++ = 0x20; /* Operational settings negotation Ok */ memcpy(rpkt, pkt, 7); rpkt += 7; *rpkt ++ = 0xff; - *rpkt ++ = 0xff; + *rpkt = 0xff; break; case H4_ALIVE_PKT: @@ -239,7 +238,7 @@ static void csrhci_in_packet(struct csrhci_s *s, uint8_t *pkt) rpkt = csrhci_out_packet_csr(s, H4_ALIVE_PKT, 2); *rpkt ++ = 0xcc; - *rpkt ++ = 0x00; + *rpkt = 0x00; break; default: @@ -364,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; @@ -390,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; |