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/usb-ohci.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/usb-ohci.c')
| -rw-r--r-- | hw/usb-ohci.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/hw/usb-ohci.c b/hw/usb-ohci.c index c575480..7dd8ed3 100644 --- a/hw/usb-ohci.c +++ b/hw/usb-ohci.c @@ -15,8 +15,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301 USA + * License along with this library; if not, see <http://www.gnu.org/licenses/>. * * TODO: * o Isochronous transfers @@ -1668,12 +1667,12 @@ static void usb_ohci_init(OHCIState *ohci, int num_ports, int devfn, if (usb_frame_time == 0) { #ifdef OHCI_TIME_WARP - usb_frame_time = ticks_per_sec; - usb_bit_time = muldiv64(1, ticks_per_sec, USB_HZ/1000); + usb_frame_time = get_ticks_per_sec(); + usb_bit_time = muldiv64(1, get_ticks_per_sec(), USB_HZ/1000); #else - usb_frame_time = muldiv64(1, ticks_per_sec, 1000); - if (ticks_per_sec >= USB_HZ) { - usb_bit_time = muldiv64(1, ticks_per_sec, USB_HZ); + usb_frame_time = muldiv64(1, get_ticks_per_sec(), 1000); + if (get_ticks_per_sec() >= USB_HZ) { + usb_bit_time = muldiv64(1, get_ticks_per_sec(), USB_HZ); } else { usb_bit_time = 1; } |