remove the conf·monitor hack and replace with sys->monitor. also use acpi novga to disable touching vga registers. Reference: /n/atom/patch/applied2013/sysmonitor Date: Sat Oct 5 19:36:27 CES 2013 Signed-off-by: quanstro@quanstro.net --- /sys/src/nix/k10/devvga.c Sat Oct 5 19:35:50 2013 +++ /sys/src/nix/k10/devvga.c Sat Oct 5 19:35:51 2013 @@ -65,17 +65,17 @@ CMunblank, "unblank", 1, }; -extern int conf·monitor; - static void vgareset(void) { + if(sys->novga) + return; /* reserve the 'standard' vga registers */ if(ioalloc(0x2b0, 0x2df-0x2b0+1, 0, "vga") < 0) panic("vga ports already allocated"); if(ioalloc(0x3c0, 0x3da-0x3c0+1, 0, "vga") < 0) panic("vga ports already allocated"); - conf·monitor = 1; + sys->monitor = 1; } static Chan* --- /sys/src/nix/port/devmouse.c Sat Oct 5 19:35:52 2013 +++ /sys/src/nix/port/devmouse.c Sat Oct 5 19:35:53 2013 @@ -104,12 +104,10 @@ extern Memimage* gscreen; -int conf·monitor = 1; - static void mousereset(void) { - if(!conf·monitor) + if(sys->monitor) return; curs = arrow; @@ -137,7 +135,7 @@ static void mouseinit(void) { - if(!conf·monitor) + if(!sys->monitor) return; curs = arrow; @@ -152,7 +150,7 @@ static Chan* mouseattach(char *spec) { - if(!conf·monitor) + if(!sys->monitor) error(Egreg); return devattach('m', spec); } @@ -209,7 +207,7 @@ static void mousecreate(Chan*, char*, int, int) { - if(!conf·monitor) + if(!sys->monitor) error(Egreg); error(Eperm); }