PERFORCE change 42720 for review
Marcel Moolenaar
marcel at FreeBSD.org
Mon Nov 17 16:58:26 PST 2003
http://perforce.freebsd.org/chv.cgi?CH=42720
Change 42720 by marcel at marcel_nfs on 2003/11/17 16:57:37
Undo more syscons hackery.
Affected files ...
.. //depot/projects/ia64/sys/conf/files.ia64#50 edit
.. //depot/projects/ia64/sys/dev/fb/fb.c#13 edit
.. //depot/projects/ia64/sys/dev/syscons/scvgarndr.c#5 edit
.. //depot/projects/ia64/sys/dev/syscons/scvidctl.c#7 edit
.. //depot/projects/ia64/sys/sys/fbio.h#6 edit
Differences ...
==== //depot/projects/ia64/sys/conf/files.ia64#50 (text+ko) ====
@@ -48,8 +48,9 @@
dev/advansys/adv_isa.c optional adv isa
dev/aic/aic_isa.c optional aic isa
dev/fb/fb.c optional fb
-dev/fb/fb.c optional vga sc
+dev/fb/fb.c optional vga
dev/fb/splash.c optional splash
+dev/fb/vga.c optional vga
dev/kbd/atkbd.c optional atkbd
dev/kbd/atkbdc.c optional atkbdc
dev/kbd/kbd.c optional atkbd
@@ -70,10 +71,6 @@
dev/syscons/syscons.c optional sc
dev/syscons/sysmouse.c optional sc
dev/uart/uart_cpu_ia64.c optional uart
-dev/vga/vga.c optional vga
-dev/vga/vga_isa.c optional vga isa
-dev/vga/vga_pci.c optional vga pci
-dev/vga/vga_vid.c optional vga sc
geom/geom_bsd.c standard
geom/geom_bsd_enc.c standard
geom/geom_gpt.c standard
@@ -126,16 +123,16 @@
ia64/ia64/uma_machdep.c standard
ia64/ia64/unaligned.c standard
ia64/ia64/unwind.c standard
-ia64/ia64/vga_machdep.c optional vga
ia64/ia64/vm_machdep.c standard
ia64/isa/isa.c optional isa
ia64/isa/isa_dma.c optional isa
ia64/pci/pci_cfgreg.c optional pci
-isa/atkbd_isa.c optional atkbd isa
-isa/atkbdc_isa.c optional atkbdc isa
-isa/fd.c optional fdc isa
-isa/psm.c optional psm isa
+isa/atkbd_isa.c optional atkbd
+isa/atkbdc_isa.c optional atkbdc
+isa/fd.c optional fdc
+isa/psm.c optional psm
isa/syscons_isa.c optional sc
+isa/vga_isa.c optional vga
kern/imgact_elf32.c optional ia32
libkern/bcmp.c standard
libkern/ffs.c standard
==== //depot/projects/ia64/sys/dev/fb/fb.c#13 (text+ko) ====
@@ -557,9 +557,9 @@
FB_DRIVER_NAME, adp->va_index, driver, adp->va_unit, adp->va_name,
adapter_name(adp->va_type), adp->va_type, adp->va_flags);
printf("%s%d: port:0x%lx-0x%lx, crtc:0x%lx, mem:0x%lx 0x%x\n",
- FB_DRIVER_NAME, adp->va_index, (u_long)adp->va_io_base,
+ FB_DRIVER_NAME, adp->va_index, (u_long)adp->va_io_base,
(u_long)adp->va_io_base + adp->va_io_size - 1,
- (u_long)adp->va_crtc_addr, (u_long)adp->va_mem_base,
+ (u_long)adp->va_crtc_addr, (u_long)adp->va_mem_base,
adp->va_mem_size);
printf("%s%d: init mode:%d, bios mode:%d, current mode:%d\n",
FB_DRIVER_NAME, adp->va_index,
@@ -637,53 +637,63 @@
*(int *)arg = adp->va_type;
break;
- case FBIO_ADPINFO: { /* get video adapter info */
- video_adapter_info_t *vi = (void*)arg;
-
- vi->va_index = adp->va_index;
- vi->va_type = adp->va_type;
- bcopy(adp->va_name, vi->va_name, imin(strlen(adp->va_name) + 1,
- sizeof(vi->va_name)));
- vi->va_unit = adp->va_unit;
- vi->va_flags = adp->va_flags;
- vi->va_io_base = adp->va_io_base;
- vi->va_io_size = adp->va_io_size;
- vi->va_crtc_addr = adp->va_crtc_addr;
- vi->va_mem_base = adp->va_mem_base;
- vi->va_mem_size = adp->va_mem_size;
+ case FBIO_ADPINFO: /* get video adapter info */
+ ((video_adapter_info_t *)arg)->va_index = adp->va_index;
+ ((video_adapter_info_t *)arg)->va_type = adp->va_type;
+ bcopy(adp->va_name, ((video_adapter_info_t *)arg)->va_name,
+ imin(strlen(adp->va_name) + 1,
+ sizeof(((video_adapter_info_t *)arg)->va_name)));
+ ((video_adapter_info_t *)arg)->va_unit = adp->va_unit;
+ ((video_adapter_info_t *)arg)->va_flags = adp->va_flags;
+ ((video_adapter_info_t *)arg)->va_io_base = adp->va_io_base;
+ ((video_adapter_info_t *)arg)->va_io_size = adp->va_io_size;
+ ((video_adapter_info_t *)arg)->va_crtc_addr = adp->va_crtc_addr;
+ ((video_adapter_info_t *)arg)->va_mem_base = adp->va_mem_base;
+ ((video_adapter_info_t *)arg)->va_mem_size = adp->va_mem_size;
+ ((video_adapter_info_t *)arg)->va_window
#ifdef __i386__
- vi->va_window = vtophys(adp->va_window);
+ = vtophys(adp->va_window);
#else
- vi->va_window = adp->va_window;
+ = adp->va_window;
#endif
- vi->va_window_size = adp->va_window_size;
- vi->va_window_gran = adp->va_window_gran;
- vi->va_window_orig = adp->va_window_orig;
+ ((video_adapter_info_t *)arg)->va_window_size
+ = adp->va_window_size;
+ ((video_adapter_info_t *)arg)->va_window_gran
+ = adp->va_window_gran;
+ ((video_adapter_info_t *)arg)->va_window_orig
+ = adp->va_window_orig;
+ ((video_adapter_info_t *)arg)->va_unused0
#ifdef __i386__
- vi->va_unused0 = (adp->va_buffer) ? vtophys(adp->va_buffer) : 0;
+ = (adp->va_buffer) ? vtophys(adp->va_buffer) : 0;
#else
- vi->va_unused0 = adp->va_buffer;
+ = adp->va_buffer;
#endif
- vi->va_buffer_size = adp->va_buffer_size;
- vi->va_mode = adp->va_mode;
- vi->va_initial_mode = adp->va_initial_mode;
- vi->va_initial_bios_mode = adp->va_initial_bios_mode;
- vi->va_line_width = adp->va_line_width;
- vi->va_disp_start.x = adp->va_disp_start.x;
- vi->va_disp_start.y = adp->va_disp_start.y;
+ ((video_adapter_info_t *)arg)->va_buffer_size
+ = adp->va_buffer_size;
+ ((video_adapter_info_t *)arg)->va_mode = adp->va_mode;
+ ((video_adapter_info_t *)arg)->va_initial_mode
+ = adp->va_initial_mode;
+ ((video_adapter_info_t *)arg)->va_initial_bios_mode
+ = adp->va_initial_bios_mode;
+ ((video_adapter_info_t *)arg)->va_line_width
+ = adp->va_line_width;
+ ((video_adapter_info_t *)arg)->va_disp_start.x
+ = adp->va_disp_start.x;
+ ((video_adapter_info_t *)arg)->va_disp_start.y
+ = adp->va_disp_start.y;
break;
- }
+
case FBIO_MODEINFO: /* get mode information */
- error = (*vidsw[adp->va_index]->get_info)(adp,
+ error = (*vidsw[adp->va_index]->get_info)(adp,
((video_info_t *)arg)->vi_mode,
- (video_info_t *)arg);
+ (video_info_t *)arg);
if (error)
error = ENODEV;
break;
case FBIO_FINDMODE: /* find a matching video mode */
- error = (*vidsw[adp->va_index]->query_mode)(adp,
- (video_info_t *)arg);
+ error = (*vidsw[adp->va_index]->query_mode)(adp,
+ (video_info_t *)arg);
break;
case FBIO_GETMODE: /* get video mode */
==== //depot/projects/ia64/sys/dev/syscons/scvgarndr.c#5 (text+ko) ====
@@ -331,11 +331,10 @@
u_char font_buf[128];
u_short cursor[32];
u_char c;
- int i, pos;
+ int pos;
int xoffset, yoffset;
-#if !defined(__ia64__)
int crtc_addr;
-#endif
+ int i;
/* prepare mousepointer char's bitmaps */
pos = (y/scp->font_size - scp->yoff)*scp->xsize + x/8 - scp->xoff;
@@ -369,7 +368,7 @@
font_buf[i + 96] = cursor[i + scp->font_size] & 0xff;
}
-#if !defined(__ia64__)
+#if 1
/* wait for vertical retrace to avoid jitter on some videocards */
crtc_addr = scp->sc->adp->va_crtc_addr;
while (!(inb(crtc_addr + 6) & 0x08)) /* idle */ ;
==== //depot/projects/ia64/sys/dev/syscons/scvidctl.c#7 (text+ko) ====
@@ -48,7 +48,6 @@
SET_DECLARE(scrndr_set, const sc_renderer_t);
-#if !defined(__ia64__)
/* for compatibility with previous versions */
/* 3.0-RELEASE used the following structure */
typedef struct old_video_adapter {
@@ -128,7 +127,6 @@
#define OLD_CONS_MODEINFO _IOWR('c', 102, old_video_info_t)
#define OLD_CONS_FINDMODE _IOWR('c', 103, old_video_info_t)
-#endif
int
sc_set_text_mode(scr_stat *scp, struct tty *tp, int mode, int xsize, int ysize,
@@ -460,9 +458,7 @@
scr_stat *scp;
video_adapter_t *adp;
video_info_t info;
-#if !defined(__ia64__)
video_adapter_info_t adp_info;
-#endif
int error;
int s;
@@ -483,7 +479,6 @@
case FBIO_ADPTYPE:
return fb_ioctl(adp, FBIO_ADPTYPE, data);
-#if !defined(__ia64__)
case OLD_CONS_ADPINFO: /* adapter information (old interface) */
if (((old_video_adapter_t *)data)->va_index >= 0) {
adp = vid_get_adapter(((old_video_adapter_t *)data)->va_index);
@@ -516,7 +511,6 @@
if (error == 0)
bcopy(&adp_info, data, sizeof(old_video_adapter_info_t));
return error;
-#endif
case CONS_ADPINFO: /* adapter information */
case FBIO_ADPINFO:
@@ -546,20 +540,17 @@
return sc_set_text_mode(scp, tp, *(int *)data, 0, 0, 0);
#endif /* SC_NO_MODE_CHANGE */
-#if !defined(__ia64__)
case OLD_CONS_MODEINFO: /* get mode information (old infterface) */
info.vi_mode = ((old_video_info_t *)data)->vi_mode;
error = fb_ioctl(adp, FBIO_MODEINFO, &info);
if (error == 0)
bcopy(&info, (old_video_info_t *)data, sizeof(old_video_info_t));
return error;
-#endif
case CONS_MODEINFO: /* get mode information */
case FBIO_MODEINFO:
return fb_ioctl(adp, FBIO_MODEINFO, data);
-#if !defined(__ia64__)
case OLD_CONS_FINDMODE: /* find a matching video mode (old interface) */
bzero(&info, sizeof(info));
bcopy((old_video_info_t *)data, &info, sizeof(old_video_info_t));
@@ -567,7 +558,6 @@
if (error == 0)
bcopy(&info, (old_video_info_t *)data, sizeof(old_video_info_t));
return error;
-#endif
case CONS_FINDMODE: /* find a matching video mode */
case FBIO_FINDMODE:
==== //depot/projects/ia64/sys/sys/fbio.h#6 (text+ko) ====
@@ -360,10 +360,8 @@
int va_little_bitian;
int va_little_endian;
int va_buffer_alias;
-#if !defined(__ia64__)
vm_offset_t va_registers; /* virtual address */
vm_offset_t va_registers_size;
-#endif
};
typedef struct video_adapter video_adapter_t;
More information about the p4-projects
mailing list