HCHALTED status bit handling (Lonnie Mendez)
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1850 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
		
							parent
							
								
									135e73c5f7
								
							
						
					
					
						commit
						52328140e2
					
				@ -174,6 +174,9 @@ static void uhci_ioport_writew(void *opaque, uint32_t addr, uint32_t val)
 | 
				
			|||||||
        if ((val & UHCI_CMD_RS) && !(s->cmd & UHCI_CMD_RS)) {
 | 
					        if ((val & UHCI_CMD_RS) && !(s->cmd & UHCI_CMD_RS)) {
 | 
				
			||||||
            /* start frame processing */
 | 
					            /* start frame processing */
 | 
				
			||||||
            qemu_mod_timer(s->frame_timer, qemu_get_clock(vm_clock));
 | 
					            qemu_mod_timer(s->frame_timer, qemu_get_clock(vm_clock));
 | 
				
			||||||
 | 
					            s->status &= ~UHCI_STS_HCHALTED;
 | 
				
			||||||
 | 
					        } else if (!(val & UHCI_CMD_RS) && !(s->cmd & UHCI_CMD_RS)) {
 | 
				
			||||||
 | 
					            s->status |= UHCI_STS_HCHALTED;
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
        if (val & UHCI_CMD_GRESET) {
 | 
					        if (val & UHCI_CMD_GRESET) {
 | 
				
			||||||
            UHCIPort *port;
 | 
					            UHCIPort *port;
 | 
				
			||||||
@ -528,6 +531,8 @@ static void uhci_frame_timer(void *opaque)
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    if (!(s->cmd & UHCI_CMD_RS)) {
 | 
					    if (!(s->cmd & UHCI_CMD_RS)) {
 | 
				
			||||||
        qemu_del_timer(s->frame_timer);
 | 
					        qemu_del_timer(s->frame_timer);
 | 
				
			||||||
 | 
					        /* set hchalted bit in status - UHCI11D 2.1.2 */
 | 
				
			||||||
 | 
					        s->status |= UHCI_STS_HCHALTED;
 | 
				
			||||||
        return;
 | 
					        return;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
    frame_addr = s->fl_base_addr + ((s->frnum & 0x3ff) << 2);
 | 
					    frame_addr = s->fl_base_addr + ((s->frnum & 0x3ff) << 2);
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user