diff options
| -rw-r--r-- | sys/arch/i386/isa/pcvt/pcvt_drv.c | 9 | ||||
| -rw-r--r-- | sys/arch/i386/isa/pcvt/pcvt_ext.c | 68 | ||||
| -rw-r--r-- | sys/arch/i386/isa/pcvt/pcvt_hdr.h | 3 |
3 files changed, 6 insertions, 74 deletions
diff --git a/sys/arch/i386/isa/pcvt/pcvt_drv.c b/sys/arch/i386/isa/pcvt/pcvt_drv.c index e3d209951c6..617d38ecd9c 100644 --- a/sys/arch/i386/isa/pcvt/pcvt_drv.c +++ b/sys/arch/i386/isa/pcvt/pcvt_drv.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pcvt_drv.c,v 1.28 1999/11/26 23:06:29 aaron Exp $ */ +/* $OpenBSD: pcvt_drv.c,v 1.29 1999/12/01 09:59:59 deraadt Exp $ */ /* * Copyright (c) 1992, 1995 Hellmuth Michaelis and Joerg Wunsch. * @@ -132,11 +132,10 @@ pcattach(struct device *parent, struct device *self, void *aux) printf("ega"); break; case VGA_ADAPTOR: - printf("%s, ", (char *)vga_string(vga_type)); + printf("vga 80"); if(can_do_132col) - printf("80/132 col"); - else - printf("80 col"); + printf("/132"); + printf(" col"); vgapelinit(); break; default: diff --git a/sys/arch/i386/isa/pcvt/pcvt_ext.c b/sys/arch/i386/isa/pcvt/pcvt_ext.c index 3b9313407b9..7088edb424f 100644 --- a/sys/arch/i386/isa/pcvt/pcvt_ext.c +++ b/sys/arch/i386/isa/pcvt/pcvt_ext.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pcvt_ext.c,v 1.25 1999/11/25 21:00:35 aaron Exp $ */ +/* $OpenBSD: pcvt_ext.c,v 1.26 1999/12/01 09:59:59 deraadt Exp $ */ /* * Copyright (c) 1992, 1995 Hellmuth Michaelis and Joerg Wunsch. @@ -618,72 +618,6 @@ s3testwritable(void) } /*---------------------------------------------------------------------------* - * return ptr to string describing vga type - *---------------------------------------------------------------------------*/ -char * -vga_string(int number) -{ - static char *vga_tab[] = { - "generic VGA", - "ET4000", - "ET3000", - "PVGA1A", - "WD90C00", - "WD90C10", - "WD90C11", - "Video7 VEGA", - "Video7 FAST", - "Video7 VER5", - "Video7 1024i", - "unknown Video7", - "TVGA 8800BR", - "TVGA 8800CS", - "TVGA 8900B", - "TVGA 8900C", - "TVGA 8900CL", - "TVGA 9000", - "TVGA 9100", - "TVGA 9200", - "TVGA 9440", - "TVGA 9660", - "TVGA 9750 (3DImage)", - "unknown Trident", - "S3 911", - "S3 924", - "S3 801/805", - "S3 928", - "S3 864", - "S3 964", - "S3 732 (Trio32)", - "S3 764 (Trio64)", - "S3 866", - "S3 868", - "S3 968", - "S3 765 (Trio64 V+)", - "S3 ViRGE", - "unknown S3", - "CL-GD5402", - "CL-GD5402r1", - "CL-GD5420", - "CL-GD5420r1", - "CL-GD5422", - "CL-GD5424", - "CL-GD5426", - "CL-GD5428", - "CL-GD5430", - "CL-GD62x5", - "unknown Cirrus", - /* VGA_MAX_CHIPSET */ - "vga_string: chipset name table ptr overflow!" - }; - - if(number > VGA_MAX_CHIPSET) /* failsafe */ - number = VGA_MAX_CHIPSET; - - return(vga_tab[number]); -} - -/*---------------------------------------------------------------------------* * toggle vga 80/132 column operation *---------------------------------------------------------------------------*/ int diff --git a/sys/arch/i386/isa/pcvt/pcvt_hdr.h b/sys/arch/i386/isa/pcvt/pcvt_hdr.h index 4842b2e45f7..c77790210fe 100644 --- a/sys/arch/i386/isa/pcvt/pcvt_hdr.h +++ b/sys/arch/i386/isa/pcvt/pcvt_hdr.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pcvt_hdr.h,v 1.30 1999/11/25 21:00:36 aaron Exp $ */ +/* $OpenBSD: pcvt_hdr.h,v 1.31 1999/12/01 09:59:59 deraadt Exp $ */ /* * Copyright (c) 1992, 1995 Hellmuth Michaelis and Joerg Wunsch. @@ -1014,7 +1014,6 @@ int vga_col ( struct video_state *svsp, int cols ); void vga_move_charset ( unsigned n, unsigned char *b, int save_it); void vga_screen_off ( void ); void vga_screen_on ( void ); -char *vga_string ( int number ); int vga_test ( void ); int vgaioctl ( Dev_t dev, u_long cmd, caddr_t data, int flag ); void vgapaletteio ( unsigned idx, struct rgb *val, int writeit ); |