Browse Source

fix a bug in tgt_machdep.c

git-svn-id: file:///svn/pmon-all/pmon-all@91 214b0138-1524-0410-9122-e5cb4b5bc56c
master
root 18 years ago
parent
commit
43d9062bac
  1. 11
      Targets/Bonito2edev/Bonito/tgt_machdep.c

11
Targets/Bonito2edev/Bonito/tgt_machdep.c

@ -324,7 +324,7 @@ void
tgt_devconfig() tgt_devconfig()
{ {
#if NMOD_VGACON > 0 #if NMOD_VGACON > 0
int rc; int rc=1;
#if NMOD_FRAMEBUFFER > 0 #if NMOD_FRAMEBUFFER > 0
unsigned long fbaddress,ioaddress; unsigned long fbaddress,ioaddress;
extern struct pci_device *vga_dev; extern struct pci_device *vga_dev;
@ -333,7 +333,7 @@ tgt_devconfig()
_pci_devinit(1); /* PCI device initialization */ _pci_devinit(1); /* PCI device initialization */
#if (NMOD_X86EMU_INT10 > 0)||(NMOD_X86EMU >0) #if (NMOD_X86EMU_INT10 > 0)||(NMOD_X86EMU >0)
SBD_DISPLAY("VGAI", 0); SBD_DISPLAY("VGAI", 0);
vga_bios_init(); rc = vga_bios_init();
#endif #endif
#if (NMOD_X86EMU_INT10 == 0 && defined(RADEON7000)) #if (NMOD_X86EMU_INT10 == 0 && defined(RADEON7000))
SBD_DISPLAY("VGAI", 0); SBD_DISPLAY("VGAI", 0);
@ -369,14 +369,13 @@ tgt_devconfig()
#if (NMOD_FRAMEBUFFER > 0) || (NMOD_VGACON > 0 ) #if (NMOD_FRAMEBUFFER > 0) || (NMOD_VGACON > 0 )
if (rc > 0) if (rc > 0)
if(!getenv("novga")) vga_available=1; if(!getenv("novga")) vga_available=1;
else vga_available=0;
#endif #endif
config_init(); config_init();
configure(); configure();
#if NMOD_VGACON >0 #if NMOD_VGACON >0
if(getenv("nokbd")) if(getenv("nokbd")) rc=1;
rc=1; else rc=kbd_initialize();
else
rc=kbd_initialize();
printf("%s\n",kbd_error_msgs[rc]); printf("%s\n",kbd_error_msgs[rc]);
if(!rc){ if(!rc){
kbd_available=1; kbd_available=1;

Loading…
Cancel
Save