gwj / at91sam9263 · Commits

Commit 8f2b1fb008a3bd8964f381c91adf7a7abeccd577

Authored by bellard
1 parent 891b38e4

more hack for CMOS interruption (enable linux /dev/rtc not to hang) - auto boot … 

…on cdrom if only device present


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@463 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 1 changed file with 5 additions and 1 deletions
@@ -2830,7 +2830,7 @@ int main_loop(void *opaque) @@ -2830,7 +2830,7 @@ int main_loop(void *opaque)
2830 pic_set_irq(0, 0); 2830 pic_set_irq(0, 0);
2831 timer_irq_pending = 0; 2831 timer_irq_pending = 0;
2832 /* XXX: RTC test */ 2832 /* XXX: RTC test */
2833 - if (cmos_data[RTC_REG_B] & 0x40) { 2833 + if (cmos_data[RTC_REG_B] & 0x50) {
2834 pic_set_irq(8, 1); 2834 pic_set_irq(8, 1);
2835 } 2835 }
2836 } 2836 }
@@ -3058,6 +3058,10 @@ int main(int argc, char **argv) @@ -3058,6 +3058,10 @@ int main(int argc, char **argv)
3058 3058
3059 if (!linux_boot && hd_filename[0] == '\0' && hd_filename[2] == '\0') 3059 if (!linux_boot && hd_filename[0] == '\0' && hd_filename[2] == '\0')
3060 help(); 3060 help();
  3061 +
  3062 + /* boot to cd by default if no hard disk */
  3063 + if (hd_filename[0] == '\0' && boot_device == 'c')
  3064 + boot_device = 'd';
3061 3065
3062 /* init debug */ 3066 /* init debug */
3063 setvbuf(stdout, NULL, _IOLBF, 0); 3067 setvbuf(stdout, NULL, _IOLBF, 0);