Hi tech@, Harmonize the way frame buffer drivers display resolution and color depth when attaching.
Comments? OK? Index: sys/arch/alpha/tc/cfb.c =================================================================== RCS file: /cvs/src/sys/arch/alpha/tc/cfb.c,v retrieving revision 1.23 diff -u -p -r1.23 cfb.c --- sys/arch/alpha/tc/cfb.c 20 Oct 2013 20:07:22 -0000 1.23 +++ sys/arch/alpha/tc/cfb.c 12 Jan 2017 15:26:42 -0000 @@ -215,7 +215,7 @@ cfbattach(parent, self, aux) printf(": can't map mem space\n"); return; } - printf(": %d x %d, %dbpp\n", sc->sc_dc->dc_wid, sc->sc_dc->dc_ht, + printf(": %dx%d, %dbpp\n", sc->sc_dc->dc_wid, sc->sc_dc->dc_ht, sc->sc_dc->dc_depth); /* Establish an interrupt handler, and clear any pending interrupts */ Index: sys/arch/alpha/tc/sfb.c =================================================================== RCS file: /cvs/src/sys/arch/alpha/tc/sfb.c,v retrieving revision 1.21 diff -u -p -r1.21 sfb.c --- sys/arch/alpha/tc/sfb.c 20 Oct 2013 20:07:22 -0000 1.21 +++ sys/arch/alpha/tc/sfb.c 12 Jan 2017 15:26:42 -0000 @@ -255,7 +255,7 @@ sfbattach(parent, self, aux) printf(": can't map mem space\n"); return; } - printf(": %d x %d, %dbpp\n", sc->sc_dc->dc_wid, sc->sc_dc->dc_ht, + printf(": %dx%d, %dbpp\n", sc->sc_dc->dc_wid, sc->sc_dc->dc_ht, sc->sc_dc->dc_depth); #if 0 Index: sys/arch/loongson/dev/radeonfb.c =================================================================== RCS file: /cvs/src/sys/arch/loongson/dev/radeonfb.c,v retrieving revision 1.1 diff -u -p -r1.1 radeonfb.c --- sys/arch/loongson/dev/radeonfb.c 7 Oct 2016 04:08:30 -0000 1.1 +++ sys/arch/loongson/dev/radeonfb.c 12 Jan 2017 15:26:42 -0000 @@ -229,7 +229,7 @@ radeonfb_attach(struct device *parent, s } } - printf(": %dx%dx%d frame buffer\n", + printf(": %dx%d, %dbpp\n", fb->ri.ri_width, fb->ri.ri_height, fb->ri.ri_depth); sc->sc_scrlist[0] = &fb->wsd; Index: sys/arch/loongson/dev/sisfb.c =================================================================== RCS file: /cvs/src/sys/arch/loongson/dev/sisfb.c,v retrieving revision 1.4 diff -u -p -r1.4 sisfb.c --- sys/arch/loongson/dev/sisfb.c 21 Oct 2013 10:36:14 -0000 1.4 +++ sys/arch/loongson/dev/sisfb.c 12 Jan 2017 15:26:42 -0000 @@ -240,7 +240,7 @@ sisfb_attach(struct device *parent, stru } } - printf(": %dx%dx%d frame buffer\n", + printf(": %dx%d, %dbpp\n", fb->ri.ri_width, fb->ri.ri_height, fb->ri.ri_depth); sc->sc_scrlist[0] = &fb->wsd; Index: sys/arch/luna88k/dev/lunafb.c =================================================================== RCS file: /cvs/src/sys/arch/luna88k/dev/lunafb.c,v retrieving revision 1.22 diff -u -p -r1.22 lunafb.c --- sys/arch/luna88k/dev/lunafb.c 22 Jul 2014 13:39:16 -0000 1.22 +++ sys/arch/luna88k/dev/lunafb.c 12 Jan 2017 15:26:42 -0000 @@ -200,7 +200,7 @@ omfbattach(struct device *parent, struct M_WAITOK | M_ZERO); omfb_getdevconfig(OMFB_FB_WADDR, sc->sc_dc); } - printf(": %d x %d, %dbpp\n", sc->sc_dc->dc_wid, sc->sc_dc->dc_ht, + printf(": %dx%d, %dbpp\n", sc->sc_dc->dc_wid, sc->sc_dc->dc_ht, hwplanebits); waa.console = omfb_console; Index: sys/arch/sgi/gio/grtwo.c =================================================================== RCS file: /cvs/src/sys/arch/sgi/gio/grtwo.c,v retrieving revision 1.12 diff -u -p -r1.12 grtwo.c --- sys/arch/sgi/gio/grtwo.c 8 Sep 2015 10:21:50 -0000 1.12 +++ sys/arch/sgi/gio/grtwo.c 12 Jan 2017 15:26:42 -0000 @@ -424,7 +424,7 @@ grtwo_attach(struct device *parent, stru dc->dc_sc = sc; printf(", revision %d, monitor sense %d\n", dc->boardrev, dc->monitor); - printf("%s: %dx%d %d-bit frame buffer\n", + printf("%s: %dx%d, %dbpp\n", self->dv_xname, GRTWO_WIDTH, GRTWO_HEIGHT, dc->depth); sc->sc_scrlist[0] = &dc->dc_wsd; Index: sys/arch/sgi/gio/light.c =================================================================== RCS file: /cvs/src/sys/arch/sgi/gio/light.c,v retrieving revision 1.7 diff -u -p -r1.7 light.c --- sys/arch/sgi/gio/light.c 7 Dec 2014 17:15:56 -0000 1.7 +++ sys/arch/sgi/gio/light.c 12 Jan 2017 15:26:42 -0000 @@ -417,7 +417,7 @@ light_attach(struct device *parent, stru printf(": LG%dMC\n", LIGHT_IS_LG1(sc->sc_dc->dc_boardrev) ? 1 : 2); printf(", revision %d\n", dc->dc_boardrev); - printf("%s: %dx%d %d-bit frame buffer\n", self->dv_xname, + printf("%s: %dx%d, %dbpp\n", self->dv_xname, dc->dc_ri.ri_width, dc->dc_ri.ri_height, dc->dc_ri.ri_depth); sc->sc_scrlist[0] = &dc->dc_wsd; Index: sys/arch/sgi/gio/newport.c =================================================================== RCS file: /cvs/src/sys/arch/sgi/gio/newport.c,v retrieving revision 1.10 diff -u -p -r1.10 newport.c --- sys/arch/sgi/gio/newport.c 8 Sep 2015 10:21:50 -0000 1.10 +++ sys/arch/sgi/gio/newport.c 12 Jan 2017 15:26:42 -0000 @@ -545,7 +545,7 @@ newport_attach(struct device *parent, st descr = "NG1"; printf(": %s (board rev %d, xmap rev %d, vc2 rev %d)\n", descr, dc->dc_boardrev, dc->dc_xmaprev, dc->dc_vc2rev); - printf("%s: %dx%d %d-bit frame buffer\n", + printf("%s: %dx%d, %dbpp\n", self->dv_xname, dc->dc_xres, dc->dc_yres, dc->dc_depth); #ifdef DEBUG printf("%s: REX3 config = %06x\n",