diff options
| author | David 'Digit' Turner <digit@android.com> | 2010-05-10 23:50:54 -0700 |
|---|---|---|
| committer | David 'Digit' Turner <digit@android.com> | 2010-05-11 18:01:32 -0700 |
| commit | a7fb77d6eca56e61e94f62e7deb4120b60b1e919 (patch) | |
| tree | 94f818fc4c89a5b5a361e3c78b9c308ccfb94064 /hw/bt-hci.c | |
| parent | fd3b1a0e32964436a5259e073857e0c4e2110122 (diff) | |
| download | external_qemu-a7fb77d6eca56e61e94f62e7deb4120b60b1e919.zip external_qemu-a7fb77d6eca56e61e94f62e7deb4120b60b1e919.tar.gz external_qemu-a7fb77d6eca56e61e94f62e7deb4120b60b1e919.tar.bz2 | |
Upstream: integrate timer/clock management changes.
Change-Id: I24acbdebe58d207352548f54dda1abf5be01e7d4
Diffstat (limited to 'hw/bt-hci.c')
| -rw-r--r-- | hw/bt-hci.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/hw/bt-hci.c b/hw/bt-hci.c index 7837d9e..669866a 100644 --- a/hw/bt-hci.c +++ b/hw/bt-hci.c @@ -15,9 +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 St, Fifth Floor, Boston, - * MA 02110-1301 USA + * along with this program; if not, see <http://www.gnu.org/licenses/>. */ #include "qemu-common.h" @@ -579,7 +577,7 @@ static void bt_hci_inquiry_result(struct bt_hci_s *hci, static void bt_hci_mod_timer_1280ms(QEMUTimer *timer, int period) { qemu_mod_timer(timer, qemu_get_clock(vm_clock) + - muldiv64(period << 7, ticks_per_sec, 100)); + muldiv64(period << 7, get_ticks_per_sec(), 100)); } static void bt_hci_inquiry_start(struct bt_hci_s *hci, int length) @@ -1088,7 +1086,7 @@ static int bt_hci_mode_change(struct bt_hci_s *hci, uint16_t handle, bt_hci_event_status(hci, HCI_SUCCESS); qemu_mod_timer(link->acl_mode_timer, qemu_get_clock(vm_clock) + - muldiv64(interval * 625, ticks_per_sec, 1000000)); + muldiv64(interval * 625, get_ticks_per_sec(), 1000000)); bt_hci_lmp_mode_change_master(hci, link->link, mode, interval); return 0; |