← Back to branch summary

~ubuntu-branches/ubuntu/hardy/kvm/hardy-backports

« back to all changes in this revision

Viewing changes to qemu/hw/fdc.c

  • Committer: Bazaar Package Importer
  • Author(s): Soren Hansen
  • Date: 2008-01-03 10:39:25 UTC
  • mfrom: (1.1.16 upstream)
  • Revision ID: james.westby@ubuntu.com-20080103103925-8480u7sq2646hvbh
Tags: 1:59+dfsg-0ubuntu1
* New upstream release
* Build with alsa support (cherry pick from 57+dfsg-2)

Show diffs side-by-side

added added

removed removed

Lines of Context:
qemu/hw/fdc.c
234
234
static void fd_revalidate (fdrive_t *drv)
235
235
{
236
236
    const fd_format_t *parse;
237
 
    int64_t nb_sectors, size;
 
237
    uint64_t nb_sectors, size;
238
238
    int i, first_match, match;
239
239
    int nb_heads, max_track, last_sect, ro;
240
240
 
382
382
    uint8_t cur_drv;
383
383
    uint8_t bootsel;
384
384
    /* Command FIFO */
385
 
    uint8_t fifo[FD_SECTOR_LEN];
 
385
    uint8_t *fifo;
386
386
    uint32_t data_pos;
387
387
    uint32_t data_len;
388
388
    uint8_t data_state;
598
598
    fdctrl = qemu_mallocz(sizeof(fdctrl_t));
599
599
    if (!fdctrl)
600
600
        return NULL;
 
601
    fdctrl->fifo = qemu_memalign(512, FD_SECTOR_LEN);
 
602
    if (fdctrl->fifo == NULL) {
 
603
        qemu_free(fdctrl);
 
604
        return NULL;
 
605
    }
601
606
    fdctrl->result_timer = qemu_new_timer(vm_clock,
602
607
                                          fdctrl_result_timer, fdctrl);
603
608