Menu
▾
▴
linuxconsole-commit — CVS commit mailing list
You can subscribe to this list here.
| 2001 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(135) |
Nov
(123) |
Dec
(83) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2002 |
Jan
(244) |
Feb
(72) |
Mar
(221) |
Apr
(91) |
May
(104) |
Jun
(93) |
Jul
(78) |
Aug
(1) |
Sep
(1) |
Oct
(29) |
Nov
(98) |
Dec
(20) |
| 2003 |
Jan
|
Feb
(21) |
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
(18) |
Sep
(18) |
Oct
(23) |
Nov
(12) |
Dec
(6) |
| 2004 |
Jan
(2) |
Feb
(32) |
Mar
|
Apr
(12) |
May
(11) |
Jun
(11) |
Jul
|
Aug
(9) |
Sep
|
Oct
(15) |
Nov
|
Dec
|
| 2005 |
Jan
|
Feb
(2) |
Mar
(11) |
Apr
(6) |
May
(1) |
Jun
(9) |
Jul
(7) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
| 2006 |
Jan
|
Feb
(1) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2007 |
Jan
|
Feb
(2) |
Mar
|
Apr
(25) |
May
(2) |
Jun
|
Jul
(5) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2008 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2009 |
Jan
|
Feb
(1) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2010 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(13) |
Oct
|
Nov
(2) |
Dec
(2) |
| 2011 |
Jan
|
Feb
|
Mar
(10) |
Apr
(10) |
May
(1) |
Jun
(6) |
Jul
|
Aug
(2) |
Sep
(5) |
Oct
|
Nov
|
Dec
|
|
From: James S. <jsi...@us...> - 2002-10-29 18:23:24
|
Update of /cvsroot/linuxconsole/ruby/linux/drivers/acorn/char In directory usw-pr-cvs1:/tmp/cvs-serv5536 Modified Files: Makefile Log Message: E gads. The acorn stuff is still not updated to the input api. Index: Makefile =================================================================== RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/acorn/char/Makefile,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- Makefile 22 Jun 2002 17:50:58 -0000 1.10 +++ Makefile 29 Oct 2002 18:23:21 -0000 1.11 @@ -2,11 +2,8 @@ # Makefile for the acorn character device drivers. # -obj-$(CONFIG_ATOMWIDE_SERIAL) += serial-atomwide.o -obj-$(CONFIG_DUALSP_SERIAL) += serial-dualsp.o obj-$(CONFIG_ARCH_ACORN) += i2c.o pcf8583.o - -# Do the i2c and rtc last -obj-y += $(obj-$(MACHINE)) +obj-y += $(obj-$(MACHINE)) include $(TOPDIR)/Rules.make + |
|
From: James S. <jsi...@us...> - 2002-10-29 18:21:31
|
Update of /cvsroot/linuxconsole/ruby/linux/drivers/sbus/char In directory usw-pr-cvs1:/tmp/cvs-serv4749 Removed Files: Makefile sunserial.c sunserial.h Log Message: Has been ported over to input api. --- Makefile DELETED --- --- sunserial.c DELETED --- --- sunserial.h DELETED --- |
|
From: James S. <jsi...@us...> - 2002-10-29 18:20:18
|
Update of /cvsroot/linuxconsole/ruby/linux/drivers/macintosh In directory usw-pr-cvs1:/tmp/cvs-serv4185 Removed Files: Makefile adbhid.c mac_hid.c Log Message: More files now in the standard tree. --- Makefile DELETED --- --- adbhid.c DELETED --- --- mac_hid.c DELETED --- |
|
From: James S. <jsi...@us...> - 2002-10-29 18:11:35
|
Update of /cvsroot/linuxconsole/ruby/linux/drivers/serial In directory usw-pr-cvs1:/tmp/cvs-serv32331 Removed Files: Config.help Config.in Makefile serial_21285.c serial_8250.c serial_8250.h serial_8250_pci.c serial_8250_pnp.c serial_amba.c serial_anakin.c serial_clps711x.c serial_core.c serial_sa1100.c serial_uart00.c Log Message: Can't keep up with the lastest changes so we remove stuff for now. --- Config.help DELETED --- --- Config.in DELETED --- --- Makefile DELETED --- --- serial_21285.c DELETED --- --- serial_8250.c DELETED --- --- serial_8250.h DELETED --- --- serial_8250_pci.c DELETED --- --- serial_8250_pnp.c DELETED --- --- serial_amba.c DELETED --- --- serial_anakin.c DELETED --- --- serial_clps711x.c DELETED --- --- serial_core.c DELETED --- --- serial_sa1100.c DELETED --- --- serial_uart00.c DELETED --- |
Update of /cvsroot/linuxconsole/ruby/linux/drivers/video
In directory usw-pr-cvs1:/tmp/cvs-serv21694
Modified Files:
mdacon.c
Removed Files:
anakinfb.c cfbcopyarea.c cfbimgblt.c cyber2000fb.c dnfb.c
fm2fb.c g364fb.c hitfb.c hpfb.c macfb.c macmodes.c modedb.c
neofb.c offb.c pmag-ba-fb.c pmagb-b-fb.c pvr2fb.c q40fb.c
sgivwfb.c vesafb.c vfb.c
Log Message:
Removed files now present in standard tree.
Index: mdacon.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/video/mdacon.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- mdacon.c 23 Dec 2001 00:04:18 -0000 1.41
+++ mdacon.c 22 Oct 2002 19:50:16 -0000 1.42
@@ -600,6 +600,7 @@
}
#ifdef MODULE
+
void __exit mda_module_exit(void)
{
/* release_vt(&mda_vt); */
--- anakinfb.c DELETED ---
--- cfbcopyarea.c DELETED ---
--- cfbimgblt.c DELETED ---
--- cyber2000fb.c DELETED ---
--- dnfb.c DELETED ---
--- fm2fb.c DELETED ---
--- g364fb.c DELETED ---
--- hitfb.c DELETED ---
--- hpfb.c DELETED ---
--- macfb.c DELETED ---
--- macmodes.c DELETED ---
--- modedb.c DELETED ---
--- neofb.c DELETED ---
--- offb.c DELETED ---
--- pmag-ba-fb.c DELETED ---
--- pmagb-b-fb.c DELETED ---
--- pvr2fb.c DELETED ---
--- q40fb.c DELETED ---
--- sgivwfb.c DELETED ---
--- vesafb.c DELETED ---
--- vfb.c DELETED ---
|
|
From: James S. <jsi...@us...> - 2002-10-22 19:50:22
|
Update of /cvsroot/linuxconsole/ruby/linux/drivers/video/fonts In directory usw-pr-cvs1:/tmp/cvs-serv21694/fonts Removed Files: Config.in Makefile fbcon_fonts.c font.h font_6x11.c font_8x16.c font_8x8.c font_acorn_8x8.c font_gb.c font_gb16.h font_jis.c font_jis16.h font_pearl_8x8.c font_sun12x22.c font_sun8x16.c Log Message: Removed files now present in standard tree. --- Config.in DELETED --- --- Makefile DELETED --- --- fbcon_fonts.c DELETED --- --- font.h DELETED --- --- font_6x11.c DELETED --- --- font_8x16.c DELETED --- --- font_8x8.c DELETED --- --- font_acorn_8x8.c DELETED --- --- font_gb.c DELETED --- --- font_gb16.h DELETED --- --- font_jis.c DELETED --- --- font_jis16.h DELETED --- --- font_pearl_8x8.c DELETED --- --- font_sun12x22.c DELETED --- --- font_sun8x16.c DELETED --- |
|
From: James S. <jsi...@us...> - 2002-10-22 19:50:21
|
Update of /cvsroot/linuxconsole/ruby/linux/drivers/video/aty In directory usw-pr-cvs1:/tmp/cvs-serv21694/aty Removed Files: Makefile atyfb.h mach64.h mach64_accel.c mach64_ct.c mach64_cursor.c mach64_gx.c Log Message: Removed files now present in standard tree. --- Makefile DELETED --- --- atyfb.h DELETED --- --- mach64.h DELETED --- --- mach64_accel.c DELETED --- --- mach64_ct.c DELETED --- --- mach64_cursor.c DELETED --- --- mach64_gx.c DELETED --- |
|
From: Vojtech P. <vo...@us...> - 2002-10-08 10:55:41
|
Update of /cvsroot/linuxconsole/ruby/utils
In directory usw-pr-cvs1:/tmp/cvs-serv12173
Modified Files:
jstest.c
Log Message:
fflush even in event mode.
Index: jstest.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/utils/jstest.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- jstest.c 25 Sep 2001 09:37:57 -0000 1.4
+++ jstest.c 8 Oct 2002 10:55:35 -0000 1.5
@@ -172,6 +172,7 @@
printf("Event: type %d, time %d, number %d, value %d\n",
js.type, js.time, js.number, js.value);
+ fflush(stdout);
}
}
|
|
From: Brad M. <bra...@us...> - 2002-09-17 08:37:35
|
Update of /cvsroot/linuxconsole/ruby/web/htdocs In directory usw-pr-cvs1:/tmp/cvs-serv18639 Modified Files: quick.html Log Message: update docs to match the current kernel config menus (ie v2.5.27) Index: quick.html =================================================================== RCS file: /cvsroot/linuxconsole/ruby/web/htdocs/quick.html,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- quick.html 24 May 2002 08:07:24 -0000 1.6 +++ quick.html 17 Sep 2002 08:37:29 -0000 1.7 @@ -69,15 +69,14 @@ <h2>Patching</h2> <p> -To compile and use the files you download, you first have to get a 2.4 +To compile and use the files you download, you first have to get a 2.5 kernel to use the drivers with. You can get it from <code><a href="ftp://ftp.kernel.org/pub/linux/kernel/v2.4/">ftp.kernel.org</a></code>. <p> <code> -wget ftp://ftp.kernel.org/pub/linux/kernel/v2.4/linux-2.4.13.tar.bz2<br> -mv linux linux-old<br> -tar xIvf linux-2.4.13.tar.bz2<br> +wget ftp://ftp.kernel.org/pub/linux/kernel/v2.5/linux-2.5.27.tar.bz2<br> +tar xjvf linux-2.5.27.tar.bz2<br> </code> <p> @@ -87,9 +86,9 @@ <code> cd ruby/linux<br> -cp -avP * ../../linux/<br> -cd ../../linux<br> -sh ../ruby/utils/remove-unused-files<br> +cp -avP * ../../linux-2.5.27/<br> +cd ../../linux-2.5.27<br> +sh ../ruby/utils/remove-obsolete-files<br> </code> <p> @@ -123,6 +122,7 @@ USB support ---><br> Input device support ---><br> Character devices ---><br> +Graphics support ---><br> </code> <p> @@ -141,7 +141,7 @@ Russel King's code from the ARM tree. We have taken this code to make it less and less TTY dependent. This menu comes before the input and char menus since alot of things are effected by this. If you select the new serial drivers you -can't select the old drivers. This prevents clashs. If you decided to try out +can't select the old drivers. This prevents clashes. If you decided to try out the new serial drivers you will see: <p> @@ -152,6 +152,7 @@ If you enable it for the ix86 platform you will see: <p> +<i>In 2.5.27, these options are still under "Character Devices"</i><p> <code> Serial port support<br> @@ -178,7 +179,7 @@ <p> Now you have finished the serial configuration if you decided to give it a -try we go onto configuring your Input Drivers. This part is a little tricky. +try we go on to configuring your Input Drivers. This part is a little tricky. You have to select quite a bunch of options to have your system operate correctly. For a most usual setup with a PS/2 mouse and a AT keyboard you need to select: @@ -186,12 +187,16 @@ <code> Input device support ---><br> - Input device support<br> - i8042 aux+kbd controller<br> - AT and PS/2 keyboards<br> - PS/2 mouse<br> + Input core support<br> + Keyboard Interface<br> Mouse interface<br> Event interface<br> + Serial i/o support ---><br> + i8042 PC Keyboard controller<br> + Keyboards ---><br> + AT keyboard support<br> + Mice ---><br> + PS/2 mouse<br> </code> <p> @@ -201,7 +206,7 @@ allows us to use the same PS/2 keybaord driver on different platforms. It is the underlying driver for the chipset that could vary. For example I can use the same PS/2 keyboard for my intel box as well as for the iPAQ I have. -I have a special adaptor that allows me to plug in my PS/2 keyboard into a +I have a special adapter that allows me to plug in my PS/2 keyboard into an iPAQ. <p> @@ -211,14 +216,12 @@ <code> USB support ---><br> Support for USB<br> - Preliminary USB device filesystem<br> - UHCI (Intel PIIX4, VIA, ...) support<br> - OHCI (Compaq, iMacs, OPTi, SiS, ALi, ...) support<br> + USB device filesystem<br> + OHCI support<br> + UHCI (most Intel and VIA) support<br> Input device support ---><br> - Input device support<br> - USB Human Interface Device<br> - Mouse interface<br> - Event interface<br> + USB Human Interface Device (full HID) support<br> + HID input layer support<br> </code> <p> @@ -236,10 +239,12 @@ <code> Input device support ---><br> - Serial port input line discipline<br> - Serial mouse<br> Mouse interface<br> Event interface<br> + Serial i/o support<br> + Serial port input line discipline<br> + Mice<br> + Serial mouse<br> </code> <p> @@ -261,9 +266,9 @@ <code> Input device support ---><br> - ns558 gameports<br> - Analog joysticks and gamepads<br> Joystick interface<br> + Gameport support<br> + Classic ISA and PnP gameport support<br> </code> <p> @@ -315,7 +320,7 @@ This just means you will use the new serial drivers instead. Select the other devices you need in the character menu and then we can go onto the Video menu. -When you enter the video menu you will see either: +When you enter the Graphics support menu you will see either: <p> <code> @@ -356,8 +361,8 @@ </code> <p> -Then, to keep a working system after you boot with the new kernel, you also -need to change a couple nodes in /dev: +If you're not using devfs, you also need to change a few nodes in +/dev to keep a working system after you boot with the new kernel: <p> <code> |
|
From: James S. <jsi...@us...> - 2002-08-02 14:58:53
|
Update of /cvsroot/linuxconsole/ruby/linux/drivers/char
In directory usw-pr-cvs1:/tmp/cvs-serv27270
Modified Files:
keyboard.c sysrq.c tty_io.c vt_ioctl.c
Log Message:
Fixes and updates.
Index: keyboard.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/char/keyboard.c,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -d -r1.76 -r1.77
--- keyboard.c 9 Apr 2002 20:51:26 -0000 1.76
+++ keyboard.c 2 Aug 2002 14:58:50 -0000 1.77
@@ -58,8 +58,6 @@
static void kbd_disconnect(struct input_handle *handle);
extern void ctrl_alt_del(void);
-#define SIZE(x) (sizeof(x)/sizeof((x)[0]))
-
/*
* Exported functions/variables
*/
@@ -99,11 +97,11 @@
/* maximum values each key_handler can handle */
const int max_vals[] = {
- 255, SIZE(func_table) - 1, SIZE(fn_handler) - 1, NR_PAD - 1,
+ 255, ARRAY_SIZE(func_table) - 1, ARRAY_SIZE(fn_handler) - 1, NR_PAD - 1,
NR_DEAD - 1, 255, 3, NR_SHIFT - 1, 255, NR_ASCII - 1, NR_LOCK - 1,
255, 2*NR_LOCK - 1, 255
};
-const int NR_TYPES = SIZE(max_vals);
+const int NR_TYPES = ARRAY_SIZE(max_vals);
int spawnpid, spawnsig;
@@ -278,7 +276,7 @@
shift_state = 0;
memset(shift_down, 0, sizeof(shift_down));
- for (i = 0; i < SIZE(key_down); i++) {
+ for (i = 0; i < ARRAY_SIZE(key_down); i++) {
if (!key_down[i])
continue;
@@ -528,7 +526,7 @@
{
if (up_flag)
return;
- if (value >= SIZE(fn_handler))
+ if (value >= ARRAY_SIZE(fn_handler))
return;
if ((vc->kbd_table.kbdmode == VC_RAW ||
vc->kbd_table.kbdmode == VC_MEDIUMRAW) &&
@@ -593,7 +591,7 @@
{
if (up_flag)
return;
- if (value < SIZE(func_table)) {
+ if (value < ARRAY_SIZE(func_table)) {
if (func_table[value])
puts_queue(vc, func_table[value]);
} else
Index: sysrq.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/char/sysrq.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- sysrq.c 18 Jun 2002 18:51:55 -0000 1.22
+++ sysrq.c 2 Aug 2002 14:58:50 -0000 1.23
@@ -68,7 +68,7 @@
if (tty)
do_SAK(tty);
- if ((tty->driver.subtype == SYSTEM_TYPE_CONSOLE) && vc)
+ if ((tty->driver.type == TTY_DRIVER_TYPE_CONSOLE) && vc)
reset_vc(vc->display_fg->fg_console);
}
static struct sysrq_key_op sysrq_SAK_op = {
@@ -85,7 +85,7 @@
{
struct vc_data *vc = (struct vc_data *) tty->driver_data;
- if ((tty->driver.subtype == SYSTEM_TYPE_CONSOLE) && vc)
+ if ((tty->driver.type == TTY_DRIVER_TYPE_CONSOLE) && vc)
vc->kbd_table.kbdmode = VC_XLATE;
}
static struct sysrq_key_op sysrq_unraw_op = {
Index: tty_io.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/char/tty_io.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- tty_io.c 10 Jul 2002 18:08:03 -0000 1.51
+++ tty_io.c 2 Aug 2002 14:58:50 -0000 1.52
@@ -1486,7 +1486,7 @@
if (!memcmp(&tmp_ws, &tty->winsize, sizeof(*arg)))
return 0;
#ifdef CONFIG_VT
- if (tty->driver.subtype == SYSTEM_TYPE_CONSOLE) {
+ if (tty->driver.type == TTY_DRIVER_TYPE_CONSOLE) {
struct vc_data *vc = (struct vc_data *) tty->driver_data;
if (!vc || vc_resize(vc, tmp_ws.ws_col, tmp_ws.ws_row))
Index: vt_ioctl.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/char/vt_ioctl.c,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- vt_ioctl.c 27 Jul 2002 19:33:27 -0000 1.68
+++ vt_ioctl.c 2 Aug 2002 14:58:50 -0000 1.69
@@ -357,6 +357,7 @@
* structure so we wont have to convert the fontdata all the time.
* /Jes
*/
+
#define max_font_size 65536
int con_font_op(struct vc_data *vc, struct console_font_op *op)
@@ -568,10 +569,10 @@
case PIO_UNIMAP:
if (!perm)
return -EPERM;
- return con_set_unimap(vc->display_fg->fg_console,
+ return con_set_unimap(vc,
tmp.entry_ct, tmp.entries);
case GIO_UNIMAP:
- return con_get_unimap(vc->display_fg->fg_console,
+ return con_get_unimap(vc,
tmp.entry_ct, &(user_ud->entry_ct),
tmp.entries);
}
|
|
From: James S. <jsi...@us...> - 2002-07-27 19:33:30
|
Update of /cvsroot/linuxconsole/ruby/linux/include/linux
In directory usw-pr-cvs1:/tmp/cvs-serv25850/linux/include/linux
Modified Files:
vt_kern.h
Log Message:
Synced to console BK.
Index: vt_kern.h
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/include/linux/vt_kern.h,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -d -r1.65 -r1.66
--- vt_kern.h 27 Feb 2002 23:56:10 -0000 1.65
+++ vt_kern.h 27 Jul 2002 19:33:27 -0000 1.66
@@ -13,9 +13,9 @@
#include <linux/kbd_kern.h>
#include <linux/input.h>
-#define MIN_NR_CONSOLES 1 /* must be at least 1 */
-#define MAX_NR_CONSOLES 63 /* serial lines start at 64 */
-#define MAX_NR_USER_CONSOLES 16 /* number of VCs per VT */
+#define MIN_NR_CONSOLES 1 /* must be at least 1 */
+#define MAX_NR_CONSOLES 63 /* serial lines start at 64 */
+#define MAX_NR_USER_CONSOLES 16 /* number of VCs per VT */
/* scroll */
#define SM_UP (1)
@@ -37,7 +37,7 @@
#define CUR_HWMASK 0x0f
#define CUR_SWMASK 0xfff0
-#define CUR_DEFAULT CUR_UNDERLINE
+#define CUR_DEFAULT CUR_UNDERLINE
/*
* Low-Level Functions
@@ -48,7 +48,7 @@
extern unsigned char color_table[];
extern int default_red[];
extern int default_grn[];
-extern int default_blu[];
+extern int default_blu[];
/*
* Data structure describing single virtual console except for data
@@ -57,190 +57,192 @@
* Fields marked with [#] must be set by the low-level driver.
* Fields marked with [!] can be changed by the low-level driver
* to achieve effects such as fast scrolling by changing the origin.
- */
+ */
#define NPAR 16
struct vc_data {
- unsigned short vc_num; /* Console number */
- unsigned int vc_cols; /* [#] Console size */
- unsigned int vc_rows;
- unsigned int vc_size_row; /* Bytes per row */
- unsigned int vc_scan_lines; /* # of scan lines */
- unsigned int vc_screensize; /* Size of screen */
- unsigned char vc_mode; /* KD_TEXT, ... */
- unsigned long vc_origin; /* [!] Start of real screen */
- unsigned long vc_scr_end; /* [!] End of real screen */
- unsigned long vc_visible_origin; /* [!] Top of visible window */
- unsigned int vc_scrollback; /* [!] Scrollback size */
- unsigned int vc_top, vc_bottom; /* Scrolling region */
- unsigned short *vc_screenbuf; /* In-memory character/attribute buffer */
- unsigned int vc_screenbuf_size;
- unsigned char vc_attr; /* Current attributes */
- unsigned char vc_def_color; /* Default colors */
- unsigned char vc_color; /* Foreground & background */
- unsigned char vc_s_color; /* Saved foreground & background */
- unsigned char vc_ulcolor; /* Color for underline mode */
- unsigned char vc_halfcolor; /* Color for half intensity mode */
- unsigned short vc_complement_mask; /* [#] Xor mask for mouse pointer */
- unsigned short vc_s_complement_mask; /* Saved mouse pointer mask */
- unsigned short vc_video_erase_char; /* Background erase character */
- unsigned int vc_x, vc_y; /* Cursor position */
- unsigned long vc_pos; /* Cursor address */
- unsigned int vc_saved_x;
- unsigned int vc_saved_y;
- unsigned int vc_state; /* Escape sequence parser state */
- unsigned int vc_npar,vc_par[NPAR]; /* Parameters of current escape sequence */
- struct kbd_struct kbd_table; /* VC keyboard state */
- unsigned short vc_hi_font_mask; /* [#] Attribute set for upper 256 chars of font or 0 if not supported */
- struct console_font_op vc_font; /* VC current font set */
- struct tty_struct *vc_tty; /* TTY we are attached to */
+ unsigned short vc_num; /* Console number */
+ unsigned int vc_cols; /* [#] Console size */
+ unsigned int vc_rows;
+ unsigned int vc_size_row; /* Bytes per row */
+ unsigned int vc_scan_lines; /* # of scan lines */
+ unsigned int vc_screensize; /* Size of screen */
+ unsigned char vc_mode; /* KD_TEXT, ... */
+ unsigned long vc_origin; /* [!] Start of real screen */
+ unsigned long vc_scr_end; /* [!] End of real screen */
+ unsigned long vc_visible_origin; /* [!] Top of visible window */
+ unsigned int vc_scrollback; /* [!] Scrollback size */
+ unsigned int vc_top, vc_bottom; /* Scrolling region */
+ unsigned short *vc_screenbuf; /* In-memory character/attribute buffer */
+ unsigned int vc_screenbuf_size;
+ unsigned char vc_attr; /* Current attributes */
+ unsigned char vc_def_color; /* Default colors */
+ unsigned char vc_color; /* Foreground & background */
+ unsigned char vc_s_color; /* Saved foreground & background */
+ unsigned char vc_ulcolor; /* Color for underline mode */
+ unsigned char vc_halfcolor; /* Color for half intensity mode */
+ /* cursor */
+ unsigned int vc_cursor_type;
+ unsigned short vc_complement_mask; /* [#] Xor mask for mouse pointer */
+ unsigned short vc_s_complement_mask; /* Saved mouse pointer mask */
+ unsigned short vc_video_erase_char; /* Background erase character */
+ unsigned int vc_x, vc_y; /* Cursor position */
+ unsigned long vc_pos; /* Cursor address */
+ unsigned int vc_saved_x;
+ unsigned int vc_saved_y;
+ unsigned int vc_state; /* Escape sequence parser state */
+ unsigned int vc_npar, vc_par[NPAR]; /* Parameters of current escape sequence */
+ struct kbd_struct kbd_table; /* VC keyboard state */
+ unsigned short vc_hi_font_mask; /* [#] Attribute set for upper 256 chars of font or 0 if not supported */
+ struct console_font_op vc_font; /* VC current font set */
+ struct tty_struct *vc_tty; /* TTY we are attached to */
/* data for manual vt switching */
- struct vt_mode vt_mode;
- int vt_pid;
- int vt_newvt;
- /* mode flags */
- unsigned int vc_charset : 1; /* Character set G0 / G1 */
- unsigned int vc_s_charset : 1; /* Saved character set */
- unsigned int vc_disp_ctrl : 1; /* Display chars < 32? */
- unsigned int vc_toggle_meta : 1; /* Toggle high bit? */
- unsigned int vc_decscnm : 1; /* Screen Mode */
- unsigned int vc_decom : 1; /* Origin Mode */
- unsigned int vc_decawm : 1; /* Autowrap Mode */
- unsigned int vc_dectcem : 1; /* Text Cursor Enable */
- unsigned int vc_irm : 1; /* Insert/Replace Mode */
- unsigned int vc_deccolm : 1; /* 80/132 Column Mode */
- /* attribute flags */
- unsigned int vc_intensity : 2; /* 0=half-bright, 1=normal, 2=bold */
- unsigned int vc_underline : 1;
- unsigned int vc_blink : 1;
- unsigned int vc_reverse : 1;
- unsigned int vc_s_intensity : 2; /* saved rendition */
- unsigned int vc_s_underline : 1;
- unsigned int vc_s_blink : 1;
- unsigned int vc_s_reverse : 1;
- /* misc */
- unsigned int vc_priv1 : 1; /* indicating a private control
- function */
- unsigned int vc_priv2 : 1; /* indicating a private control
- function */
- unsigned int vc_priv3 : 1; /* indicating a private control
- function */
- unsigned int vc_priv4 : 1; /* indicating a private control
- function (used to be called "ques") */
- unsigned int vc_need_wrap : 1;
- unsigned int vc_can_do_color : 1;
- unsigned int vc_report_mouse : 2;
- unsigned char vc_utf : 1; /* Unicode UTF-8 encoding */
- unsigned char vc_utf_count;
- int vc_utf_char;
- unsigned int vc_tab_stop[8]; /* Tab stops. 256 columns. */
- unsigned char vc_palette[16*3]; /* Colour palette for VGA+ */
- unsigned int vc_translate; /* Current ACM */
- unsigned char vc_G0_charset;
- unsigned char vc_G1_charset;
- unsigned char vc_saved_G0;
- unsigned char vc_saved_G1;
- unsigned int vc_bell_pitch; /* Console bell pitch */
- unsigned int vc_bell_duration; /* Console bell duration */
- unsigned int vc_cursor_type;
- struct vt_struct *display_fg; /* Ptr to display */
- unsigned long vc_uni_pagedir;
- unsigned long *vc_uni_pagedir_loc; /* [!] Location of uni_pagedir var
-iable for this console */
- wait_queue_head_t paste_wait; /* For selections */
- /* Internal flags */
- unsigned int vc_decscl; /* operating level */
- unsigned int vc_c8bit : 1; /* 8-bit controls */
- unsigned int vc_d8bit : 1; /* 8-bit data */
- unsigned int vc_shift : 1; /* single shift */
- /* Private modes */
- unsigned int vc_decckm : 1; /* Cursor Keys */
- unsigned int vc_decsclm : 1; /* Scrolling */
- unsigned int vc_decarm : 1; /* Autorepeat */
- unsigned int vc_decnrcm : 1; /* National Replacement Characte
-r Set */
- unsigned int vc_decnkm : 1; /* Numeric Keypad */
- /* ANSI / ISO mode flags */
- unsigned int vc_kam : 1; /* Keyboard Action */
- unsigned int vc_crm : 1; /* Console Representation */
- unsigned int vc_lnm : 1; /* Line feed/New line */
- /* Charset mappings */
- unsigned char vc_GL_charset;
- unsigned char vc_GR_charset;
- unsigned char vc_G2_charset;
- unsigned char vc_G3_charset;
- unsigned char vc_GS_charset;
- unsigned char vc_saved_G2;
- unsigned char vc_saved_G3;
- unsigned char vc_saved_GS;
-};
+ struct vt_mode vt_mode;
+ int vt_pid;
+ int vt_newvt;
+ /* mode flags */
+ unsigned int vc_charset:1; /* Character set G0 / G1 */
+ unsigned int vc_s_charset:1; /* Saved character set */
+ unsigned int vc_disp_ctrl:1; /* Display chars < 32? */
+ unsigned int vc_toggle_meta:1; /* Toggle high bit? */
+ unsigned int vc_decscnm:1; /* Screen Mode */
+ unsigned int vc_decom:1; /* Origin Mode */
+ unsigned int vc_decawm:1; /* Autowrap Mode */
+ unsigned int vc_dectcem:1; /* Text Cursor Enable */
+ unsigned int vc_irm:1; /* Insert/Replace Mode */
+ unsigned int vc_deccolm:1; /* 80/132 Column Mode */
+ /* attribute flags */
+ unsigned int vc_intensity:2; /* 0=half-bright, 1=normal, 2=bold */
+ unsigned int vc_underline:1;
+ unsigned int vc_blink:1;
+ unsigned int vc_reverse:1;
+ unsigned int vc_s_intensity:2; /* saved rendition */
+ unsigned int vc_s_underline:1;
+ unsigned int vc_s_blink:1;
+ unsigned int vc_s_reverse:1;
+ /* misc */
+ unsigned int vc_priv1:1; /* indicating a private control
+ function */
+ unsigned int vc_priv2:1; /* indicating a private control
+ function */
+ unsigned int vc_priv3:1; /* indicating a private control
+ function */
+ unsigned int vc_priv4:1; /* indicating a private control
+ function (used to be called "ques") */
+ unsigned int vc_need_wrap:1;
+ unsigned int vc_can_do_color:1;
+ unsigned int vc_report_mouse:2;
+ unsigned char vc_utf:1; /* Unicode UTF-8 encoding */
+ unsigned char vc_utf_count;
+ int vc_utf_char;
+ unsigned int vc_tab_stop[8]; /* Tab stops. 256 columns. */
+ unsigned char vc_palette[16 * 3]; /* Colour palette for VGA+ */
+ unsigned int vc_translate; /* Current ACM */
+ unsigned char vc_G0_charset;
+ unsigned char vc_G1_charset;
+ unsigned char vc_saved_G0;
+ unsigned char vc_saved_G1;
+ unsigned int vc_bell_pitch; /* Console bell pitch */
+ unsigned int vc_bell_duration; /* Console bell duration */
+ struct vt_struct *display_fg; /* Ptr to display */
+ unsigned long vc_uni_pagedir;
+ unsigned long *vc_uni_pagedir_loc; /* [!] Location of uni_pagedir var
+ iable for this console */
+ wait_queue_head_t paste_wait; /* For selections */
+ /* Internal flags */
+ unsigned int vc_decscl; /* operating level */
+ unsigned int vc_c8bit:1; /* 8-bit controls */
+ unsigned int vc_d8bit:1; /* 8-bit data */
+ unsigned int vc_shift:1; /* single shift */
+ /* Private modes */
+ unsigned int vc_decckm:1; /* Cursor Keys */
+ unsigned int vc_decsclm:1; /* Scrolling */
+ unsigned int vc_decarm:1; /* Autorepeat */
+ unsigned int vc_decnrcm:1; /* National Replacement Characte
+ r Set */
+ unsigned int vc_decnkm:1; /* Numeric Keypad */
+ /* ANSI / ISO mode flags */
+ unsigned int vc_kam:1; /* Keyboard Action */
+ unsigned int vc_crm:1; /* Console Representation */
+ unsigned int vc_lnm:1; /* Line feed/New line */
+ /* Charset mappings */
+ unsigned char vc_GL_charset;
+ unsigned char vc_GR_charset;
+ unsigned char vc_G2_charset;
+ unsigned char vc_G3_charset;
+ unsigned char vc_GS_charset;
+ unsigned char vc_saved_G2;
+ unsigned char vc_saved_G3;
+ unsigned char vc_saved_GS;
+};
struct consw {
- const char *(*con_startup)(struct vt_struct *, int);
- void (*con_init)(struct vc_data *);
- void (*con_deinit)(struct vc_data *);
- void (*con_clear)(struct vc_data *, int, int, int, int);
- void (*con_putc)(struct vc_data *, int, int, int);
- void (*con_putcs)(struct vc_data *, const unsigned short *, int, int, int);
- void (*con_cursor)(struct vc_data *, int);
- int (*con_scroll_region)(struct vc_data *, int, int, int, int);
- void (*con_bmove)(struct vc_data *, int, int, int, int, int, int);
- int (*con_blank)(struct vc_data *, int);
- int (*con_font_op)(struct vc_data *, struct console_font_op *);
- int (*con_resize)(struct vc_data *, unsigned int, unsigned int);
- int (*con_set_palette)(struct vc_data *, unsigned char *);
- int (*con_scroll)(struct vc_data *, int);
- int (*con_set_origin)(struct vc_data *);
- u8 (*con_build_attr)(struct vc_data *, u8, u8, u8, u8, u8);
- void (*con_invert_region)(struct vc_data *, u16 *, int);
+ const char *(*con_startup) (struct vt_struct *, int);
+ void (*con_init) (struct vc_data *);
+ void (*con_deinit) (struct vc_data *);
+ void (*con_clear) (struct vc_data *, int, int, int, int);
+ void (*con_putc) (struct vc_data *, int, int, int);
+ void (*con_putcs) (struct vc_data *, const unsigned short *, int,
+ int, int);
+ void (*con_cursor) (struct vc_data *, int);
+ int (*con_scroll_region) (struct vc_data *, int, int, int, int);
+ void (*con_bmove) (struct vc_data *, int, int, int, int, int, int);
+ int (*con_blank) (struct vc_data *, int);
+ int (*con_font_op) (struct vc_data *, struct console_font_op *);
+ int (*con_resize) (struct vc_data *, unsigned int, unsigned int);
+ int (*con_set_palette) (struct vc_data *, unsigned char *);
+ int (*con_scroll) (struct vc_data *, int);
+ int (*con_set_origin) (struct vc_data *);
+ u8(*con_build_attr) (struct vc_data *, u8, u8, u8, u8, u8);
+ void (*con_invert_region) (struct vc_data *, u16 *, int);
};
-extern const struct consw dummy_con; /* dummy console buffer */
-extern const struct consw newport_con; /* SGI Newport console */
-extern const struct consw prom_con; /* SPARC PROM console */
-extern const struct consw nvvga_con; /* NVIDIA text console */
+extern const struct consw dummy_con; /* dummy console buffer */
+extern const struct consw newport_con; /* SGI Newport console */
+extern const struct consw prom_con; /* SPARC PROM console */
+extern const struct consw nvvga_con; /* NVIDIA text console */
void take_over_console(struct vt_struct *vt, const struct consw *sw);
struct vt_struct {
- struct vc_data *fg_console; /* VC being displayed */
- struct vc_data *last_console; /* VC we last switched from */
- struct vc_data *want_vc; /* VC we want to switch to */
- int scrollback_delta;
+ struct vc_data *fg_console; /* VC being displayed */
+ struct vc_data *last_console; /* VC we last switched from */
+ struct vc_data *want_vc; /* VC we want to switch to */
+ int scrollback_delta;
int cursor_original;
char kmalloced;
- char vt_dont_switch; /* VC switching flag */
- char vt_blanked; /* Is this display blanked */
- int blank_mode; /* 0:none 1:suspendV 2:suspendH 3:powerdown */
- int blank_interval; /* How long before blanking */
- int off_interval;
- struct timer_list timer; /* Timer for VT blanking */
- struct pm_dev *pm_con; /* power management */
- /* This is a temporary buffer used to prepare a tty console write
- * so that we can easily avoid touching user space while holding the
- * console spinlock. It is shared by with vc_screen read/write tty calls.
- */
- char con_buf[PAGE_SIZE];
- struct semaphore lock; /* Lock for con_buf */
- void *data_hook; /* Hook for driver data */
- const struct consw *vt_sw; /* Display driver for VT */
- const struct consw *cache_sw; /* Save consw when KD_GRAPHIC */
- struct vc_data *default_mode; /* Default mode */
- struct tq_struct vt_tq; /* VT task queue */
- struct input_handle *keyboard; /* Keyboard attached */
+ char vt_dont_switch; /* VC switching flag */
+ char vt_blanked; /* Is this display blanked */
+ int blank_mode; /* 0:none 1:suspendV 2:suspendH 3:powerdown */
+ int blank_interval; /* How long before blanking */
+ int off_interval;
+ struct timer_list timer; /* Timer for VT blanking */
+ struct pm_dev *pm_con; /* power management */
+ /* This is a temporary buffer used to prepare a tty console write
+ * so that we can easily avoid touching user space while holding the
+ * console spinlock. It is shared by with vc_screen read/write tty calls.
+ */
+ char con_buf[PAGE_SIZE];
+ struct semaphore lock; /* Lock for con_buf */
+ void *data_hook; /* Hook for driver data */
+ const struct consw *vt_sw; /* Display driver for VT */
+ const struct consw *cache_sw; /* Save consw when KD_GRAPHIC */
+ struct vc_data *default_mode; /* Default mode */
+ struct tq_struct vt_tq; /* VT task queue */
+ struct input_handle *keyboard; /* Keyboard attached */
unsigned int first_vc;
- struct vc_data *vc_cons[MAX_NR_USER_CONSOLES]; /* VT's VC pool */
- struct vt_struct *next;
-};
+ struct vc_data *vc_cons[MAX_NR_USER_CONSOLES]; /* VT's VC pool */
+ struct vt_struct *next;
+};
extern struct vt_struct *vt_cons;
extern struct vt_struct *admin_vt;
static inline void set_console(struct vc_data *vc)
{
- vc->display_fg->want_vc = vc;
- schedule_task(&vc->display_fg->vt_tq);
+ vc->display_fg->want_vc = vc;
+ schedule_task(&vc->display_fg->vt_tq);
}
/* universal VT emulation functions */
@@ -257,8 +259,8 @@
const char *vt_map_display(struct vt_struct *vt, int init);
void vt_map_input(struct vt_struct *vt);
int release_vt(struct vt_struct *vt);
-struct vc_data* find_vc(int currcons);
-struct vc_data* vc_allocate(unsigned int console);
+struct vc_data *find_vc(int currcons);
+struct vc_data *vc_allocate(unsigned int console);
int vc_resize(struct vc_data *vc, unsigned int lines, unsigned int cols);
int vc_disallocate(struct vc_data *vc);
void vc_init(struct vc_data *vc, int do_clear);
@@ -273,8 +275,10 @@
inline int resize_screen(struct vc_data *vc, int width, int height);
void scroll_up(struct vc_data *vc, int);
void scroll_down(struct vc_data *vc, int);
-void scroll_region_up(struct vc_data *vc,unsigned int t,unsigned int b,int nr);
-void scroll_region_down(struct vc_data *vc, unsigned int t, unsigned int b, int nr);
+void scroll_region_up(struct vc_data *vc, unsigned int t, unsigned int b,
+ int nr);
+void scroll_region_down(struct vc_data *vc, unsigned int t, unsigned int b,
+ int nr);
void default_attr(struct vc_data *vc);
void update_attr(struct vc_data *vc);
void insert_char(struct vc_data *vc, unsigned int nr);
@@ -282,11 +286,13 @@
void insert_line(struct vc_data *vc, unsigned int nr);
void delete_line(struct vc_data *vc, unsigned int nr);
void set_origin(struct vc_data *vc);
-inline void clear_region(struct vc_data *vc,int x,int y,int width,int height);
+inline void clear_region(struct vc_data *vc, int x, int y, int width,
+ int height);
void do_update_region(struct vc_data *vc, unsigned long start, int count);
void update_region(struct vc_data *vc, unsigned long start, int count);
void update_screen(struct vc_data *vc);
-inline unsigned short *screenpos(struct vc_data *vc, int offset, int viewed);
+inline unsigned short *screenpos(struct vc_data *vc, int offset,
+ int viewed);
void invert_screen(struct vc_data *vc, int offset, int count, int viewed);
void kd_mksound(struct vc_data *vc, unsigned int hz, unsigned int ticks);
void unblank_screen(struct vt_struct *vt);
@@ -294,7 +300,7 @@
int pm_con_request(struct pm_dev *dev, pm_request_t rqst, void *data);
struct tty_struct;
-void respond_string(const char * p, struct tty_struct * tty);
+void respond_string(const char *p, struct tty_struct *tty);
int tioclinux(struct tty_struct *tty, unsigned long arg);
/* consolemap.c */
@@ -303,13 +309,14 @@
struct unipair;
void console_map_init(void);
-int con_set_trans_old(struct vc_data *vc, unsigned char * table);
-int con_get_trans_old(struct vc_data *vc, unsigned char * table);
-int con_set_trans_new(struct vc_data *vc, unsigned short * table);
-int con_get_trans_new(struct vc_data *vc, unsigned short * table);
+int con_set_trans_old(struct vc_data *vc, unsigned char *table);
+int con_get_trans_old(struct vc_data *vc, unsigned char *table);
+int con_set_trans_new(struct vc_data *vc, unsigned short *table);
+int con_get_trans_new(struct vc_data *vc, unsigned short *table);
int con_clear_unimap(struct vc_data *vc, struct unimapinit *ui);
int con_set_unimap(struct vc_data *vc, ushort ct, struct unipair *list);
-int con_get_unimap(struct vc_data *vc, ushort ct, ushort *uct, struct unipair *list);
+int con_get_unimap(struct vc_data *vc, ushort ct, ushort * uct,
+ struct unipair *list);
int con_set_default_unimap(struct vc_data *vc);
void con_free_unimap(struct vc_data *vc);
void con_protect_unimap(struct vc_data *vc, int rdonly);
@@ -317,7 +324,8 @@
/* vt_ioctl.c */
void change_console(struct vc_data *new_vc, struct vc_data *old_vc);
-void complete_change_console(struct vc_data *new_vc, struct vc_data *old_vc);
+void complete_change_console(struct vc_data *new_vc,
+ struct vc_data *old_vc);
void reset_vc(struct vc_data *vc);
-#endif /* _VT_KERN_H */
+#endif /* _VT_KERN_H */
|
|
From: James S. <jsi...@us...> - 2002-07-27 19:33:30
|
Update of /cvsroot/linuxconsole/ruby/utils In directory usw-pr-cvs1:/tmp/cvs-serv25850/utils Modified Files: remove-obsolete-files Log Message: Synced to console BK. Index: remove-obsolete-files =================================================================== RCS file: /cvsroot/linuxconsole/ruby/utils/remove-obsolete-files,v retrieving revision 1.34 retrieving revision 1.35 diff -u -d -r1.34 -r1.35 --- remove-obsolete-files 23 Jul 2002 19:18:51 -0000 1.34 +++ remove-obsolete-files 27 Jul 2002 19:33:27 -0000 1.35 @@ -45,6 +45,8 @@ rm -fv drivers/sbus/char/sunmouse.c rm -fv drivers/sbus/char/sunmouse.h rm -fv drivers/video/fbcon-afb.c +rm -fv drivers/video/fbcon-accel.c +rm -fv drivers/video/fbcon-accel.h rm -fv drivers/video/fbcon-cfb16.c rm -fv drivers/video/fbcon-cfb2.c rm -fv drivers/video/fbcon-cfb24.c |
|
From: James S. <jsi...@us...> - 2002-07-27 19:33:30
|
Update of /cvsroot/linuxconsole/ruby/linux/drivers/char
In directory usw-pr-cvs1:/tmp/cvs-serv25850/linux/drivers/char
Modified Files:
decvte.c vt.c vt_ioctl.c
Log Message:
Synced to console BK.
Index: decvte.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/char/decvte.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- decvte.c 28 Feb 2002 00:00:58 -0000 1.19
+++ decvte.c 27 Jul 2002 19:33:27 -0000 1.20
@@ -56,18 +56,18 @@
*/
/* Different states of the emulator */
-enum { ESinit,
- /* ESC substates */
- ESesc, ESacs, ESscf, ESgzd4, ESg1d4, ESg2d4,
- ESg3d4, ESg1d6, ESg2d6, ESg3d6, ESdocs,
- /* CSI substates */
- EScsi, EScsi_getpars, EScsi_gotpars, EScsi_space,
- EScsi_exclam, EScsi_dquote, EScsi_dollar, EScsi_and,
- EScsi_squote, EScsi_star, EScsi_plus,
[...3445 lines suppressed...]
+ break;
+ case 'B': /* ASCII */
+ G3_charset = LAT1_MAP;
+ break;
+ case 'U':
+ G3_charset = IBMPC_MAP;
+ break;
+ case 'K':
+ G3_charset = USER_MAP;
+ break;
+ }
+ if (charset == 1)
+ set_translate(vc, G3_charset);
+ vc_state = ESinit;
+ return;
+ default:
+ vc_state = ESinit;
+ }
}
-
Index: vt.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/char/vt.c,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -d -r1.121 -r1.122
--- vt.c 16 May 2002 18:01:39 -0000 1.121
+++ vt.c 27 Jul 2002 19:33:27 -0000 1.122
@@ -45,14 +45,14 @@
* glyph unless the disp_ctrl mode is explicitly enabled.
*/
#define CTRL_ACTION 0x0d00ff81
-#define CTRL_ALWAYS 0x0800f501 /* Cannot be overridden by disp_ctrl */
+#define CTRL_ALWAYS 0x0800f501 /* Cannot be overridden by disp_ctrl */
-extern void vcs_make_devfs (unsigned int index, int unregister);
+extern void vcs_make_devfs(unsigned int index, int unregister);
#ifdef CONFIG_VGA_CONSOLE
extern void vga_console_init(void);
#endif
[...2446 lines suppressed...]
+ /* If the console changed between mono <-> color, then
+ * the attributes in the screenbuf will be wrong. The
+ * following resets all attributes to something sane.
+ */
+ if (old_was_color != vc->vc_can_do_color)
+ clear_buffer_attributes(vc);
+ }
}
vc = vt->fg_console;
update_screen(vc);
- printk("Console: switching to %s %s %dx%d\n",
- vc->vc_can_do_color ? "colour" : "mono",
- desc, vc->vc_cols, vc->vc_rows);
+ printk("Console: switching to %s %s %dx%d\n",
+ vc->vc_can_do_color ? "colour" : "mono",
+ desc, vc->vc_cols, vc->vc_rows);
}
/*
Index: vt_ioctl.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/char/vt_ioctl.c,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -d -r1.67 -r1.68
--- vt_ioctl.c 16 May 2002 18:01:39 -0000 1.67
+++ vt_ioctl.c 27 Jul 2002 19:33:27 -0000 1.68
@@ -2,7 +2,7 @@
* linux/drivers/char/vt_ioctl.c
*
* Copyright (C) 1992 obz under the linux copyright
- * Copyright (C) 2001 James Simmons <jsi...@tr...>
+ * Copyright (C) 2002 James Simmons <jsi...@us...>
*
* Dynamic diacritical handling - ae...@cw... - Dec 1993
* Dynamic keymap and string allocation - ae...@cw... - May 1994
@@ -34,10 +34,6 @@
#include <linux/kbd_diacr.h>
#include <linux/selection.h>
[...1713 lines suppressed...]
+ * to normal operation. In this case, we'll also change
* back to KD_TEXT mode. I'm not sure if this is
- * strictly correct but it saves the agony when the X
- * server dies and the screen remains blanked due to
- * KD_GRAPHICS! It would be nice to do this outside of
- * VT_PROCESS but there is no single process to account
- * and tracking tty count may be undesirable.
- */
+ * strictly correct but it saves the agony when the X
+ * server dies and the screen remains blanked due to
+ * KD_GRAPHICS! It would be nice to do this outside of
+ * VT_PROCESS but there is no single process to account
+ * and tracking tty count may be undesirable.
+ */
if (old_vc_mode != new_vc->vc_mode) {
- if (new_vc->vc_mode == KD_TEXT)
+ if (new_vc->vc_mode == KD_TEXT)
unblank_screen(new_vc->display_fg);
else
do_blank_screen(new_vc);
|
|
From: johann d. <jd...@us...> - 2002-07-27 14:23:49
|
Update of /cvsroot/linuxconsole/linux-ff In directory usw-pr-cvs1:/tmp/cvs-serv30575 Log Message: Initial import. Status: Vendor Tag: joh Release Tags: initial N linux-ff/drivers/hid/fixp-arith.h N linux-ff/drivers/hid/hid-core.c N linux-ff/drivers/hid/hid-debug.h N linux-ff/drivers/hid/hid-ff.c N linux-ff/drivers/hid/hid-input.c N linux-ff/drivers/hid/hid-lgff.c N linux-ff/drivers/hid/hid.h N linux-ff/drivers/hid/hiddev.c N linux-ff/drivers/hid/Config.in N linux-ff/drivers/hid/Makefile N linux-ff/drivers/hid/Config.help N linux-ff/drivers/iforce/Config.help N linux-ff/drivers/iforce/Config.in N linux-ff/drivers/iforce/iforce-ff.c N linux-ff/drivers/iforce/iforce-main.c N linux-ff/drivers/iforce/iforce-packets.c N linux-ff/drivers/iforce/iforce-serio.c N linux-ff/drivers/iforce/iforce-usb.c N linux-ff/drivers/iforce/iforce.h N linux-ff/drivers/iforce/Makefile N linux-ff/include/input.h No conflicts created by this import ***** Bogus filespec: - Imported sources |
|
From: Vojtech P. <vo...@us...> - 2002-07-25 09:51:43
|
Update of /cvsroot/linuxconsole/ruby/utils
In directory usw-pr-cvs1:/tmp/cvs-serv8284
Modified Files:
evtest.c
Log Message:
Add support for EV_SYN.
Index: evtest.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/utils/evtest.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- evtest.c 17 Jul 2002 08:50:55 -0000 1.18
+++ evtest.c 25 Jul 2002 09:51:39 -0000 1.19
@@ -33,7 +33,7 @@
#include <unistd.h>
#include <stdio.h>
-char *events[EV_MAX + 1] = { "Reset", "Key", "Relative", "Absolute", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+char *events[EV_MAX + 1] = { "Sync", "Key", "Relative", "Absolute", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, "LED", "Sound", NULL, "Repeat", "ForceFeedback", NULL, "ForceFeedbackStatus"};
char *keys[KEY_MAX + 1] = { "Reserved", "Esc", "1", "2", "3", "4", "5", "6", "7", "8", "9", "0", "Minus", "Equal", "Backspace",
"Tab", "Q", "W", "E", "R", "T", "Y", "U", "I", "O", "P", "LeftBrace", "RightBrace", "Enter", "LeftControl", "A", "S", "D", "F", "G",
@@ -164,12 +164,18 @@
}
for (i = 0; i < rd / sizeof(struct input_event); i++)
- printf("Event: time %ld.%06ld, type %d (%s), code %d (%s), value %d\n",
- ev[i].time.tv_sec, ev[i].time.tv_usec, ev[i].type,
- events[ev[i].type] ? events[ev[i].type] : "?",
- ev[i].code,
- names[ev[i].type] ? (names[ev[i].type][ev[i].code] ? names[ev[i].type][ev[i].code] : "?") : "?",
- ev[i].value);
+
+ if (ev[i].type == EV_SYN) {
+ printf("Event: time %ld.%06ld, -------------- %s ------------\n",
+ ev[i].time.tv_sec, ev[i].time.tv_usec, ev[i].code ? "Report Sync" : "Config Sync");
+ } else {
+ printf("Event: time %ld.%06ld, type %d (%s), code %d (%s), value %d\n",
+ ev[i].time.tv_sec, ev[i].time.tv_usec, ev[i].type,
+ events[ev[i].type] ? events[ev[i].type] : "?",
+ ev[i].code,
+ names[ev[i].type] ? (names[ev[i].type][ev[i].code] ? names[ev[i].type][ev[i].code] : "?") : "?",
+ ev[i].value);
+ }
}
}
|
|
From: James S. <jsi...@us...> - 2002-07-23 19:40:39
|
Update of /cvsroot/linuxconsole/ruby In directory usw-pr-cvs1:/tmp/cvs-serv7469 Added Files: AGAINST-2.5.27 Removed Files: AGAINST-2.5.26 Log Message: Synced to 2.5.27 --- NEW FILE: AGAINST-2.5.27 --- --- AGAINST-2.5.26 DELETED --- |
|
From: James S. <jsi...@us...> - 2002-07-23 19:40:39
|
Update of /cvsroot/linuxconsole/ruby/linux/arch/i386 In directory usw-pr-cvs1:/tmp/cvs-serv7469/linux/arch/i386 Modified Files: config.in Log Message: Synced to 2.5.27 Index: config.in =================================================================== RCS file: /cvsroot/linuxconsole/ruby/linux/arch/i386/config.in,v retrieving revision 1.45 retrieving revision 1.46 diff -u -d -r1.45 -r1.46 --- config.in 23 Jul 2002 19:18:47 -0000 1.45 +++ config.in 23 Jul 2002 19:40:31 -0000 1.46 @@ -413,4 +413,5 @@ endmenu +source security/Config.in source lib/Config.in |
|
From: James S. <jsi...@us...> - 2002-07-23 19:40:39
|
Update of /cvsroot/linuxconsole/ruby/linux In directory usw-pr-cvs1:/tmp/cvs-serv7469/linux Modified Files: Makefile Log Message: Synced to 2.5.27 Index: Makefile =================================================================== RCS file: /cvsroot/linuxconsole/ruby/linux/Makefile,v retrieving revision 1.67 retrieving revision 1.68 diff -u -d -r1.67 -r1.68 --- Makefile 23 Jul 2002 19:18:46 -0000 1.67 +++ Makefile 23 Jul 2002 19:40:31 -0000 1.68 @@ -1,8 +1,8 @@ VERSION = 2 PATCHLEVEL = 5 -SUBLEVEL = 26 +SUBLEVEL = 27 EXTRAVERSION = -ruby - + # *DOCUMENTATION* # Too see a list of typical targets execute "make help" # More info can be located in ./Documentation/kbuild @@ -157,7 +157,8 @@ export srctree objtree -SUBDIRS := init kernel mm fs ipc lib drivers sound net +SUBDIRS := init kernel mm fs ipc lib drivers sound net security + noconfig_targets := xconfig menuconfig config oldconfig randconfig \ defconfig allyesconfig allnoconfig allmodconfig \ @@ -223,7 +224,7 @@ # --------------------------------------------------------------------------- INIT := init/init.o -CORE_FILES := kernel/kernel.o mm/mm.o fs/fs.o ipc/ipc.o +CORE_FILES := kernel/kernel.o mm/mm.o fs/fs.o ipc/ipc.o security/built-in.o LIBS := lib/lib.a DRIVERS := drivers/built-in.o sound/sound.o NETWORKS := net/network.o |
|
From: James S. <jsi...@us...> - 2002-07-23 19:19:24
|
Update of /cvsroot/linuxconsole/ruby/linux/arch/ppc/kernel
In directory usw-pr-cvs1:/tmp/cvs-serv31846/linux/arch/ppc/kernel
Modified Files:
ppc4xx_setup.c setup.c
Log Message:
Synced to 2.5.26
Index: ppc4xx_setup.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/arch/ppc/kernel/ppc4xx_setup.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- ppc4xx_setup.c 12 Jul 2002 17:17:52 -0000 1.5
+++ ppc4xx_setup.c 23 Jul 2002 19:18:48 -0000 1.6
@@ -21,7 +21,6 @@
* used for all other board specific instructions needed during
* platform_init.
* moved RTC to board.c files
- * moved VT/FB to board.c files
* moved r/w4 ide to redwood.c
*
*/
@@ -58,6 +57,7 @@
/* Function Prototypes */
extern void abort(void);
extern void ppc4xx_find_bridges(void);
+
extern void ppc4xx_wdt_heartbeat(void);
extern int wdt_enable;
extern unsigned long wdt_period;
@@ -74,17 +74,10 @@
static void __init
ppc4xx_setup_arch(void)
{
-
/* Setup PCI host bridges */
-
#ifdef CONFIG_PCI
ppc4xx_find_bridges();
#endif
-
-#if defined(CONFIG_FB)
- conswitchp = &dummy_con;
-#endif
-
board_setup_arch();
}
Index: setup.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/arch/ppc/kernel/setup.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- setup.c 22 Jun 2002 17:50:58 -0000 1.4
+++ setup.c 23 Jul 2002 19:18:48 -0000 1.5
@@ -81,10 +81,6 @@
unsigned long r5, unsigned long r6, unsigned long r7);
#endif /* CONFIG_ALL_PPC */
-#ifdef CONFIG_MAGIC_SYSRQ
-unsigned long SYSRQ_KEY;
-#endif /* CONFIG_MAGIC_SYSRQ */
-
#ifdef CONFIG_VGA_CONSOLE
unsigned long vgacon_remap_base;
#endif
|
|
From: James S. <jsi...@us...> - 2002-07-23 19:19:24
|
Update of /cvsroot/linuxconsole/ruby/linux/arch/mips
In directory usw-pr-cvs1:/tmp/cvs-serv31846/linux/arch/mips
Modified Files:
config.in
Log Message:
Synced to 2.5.26
Index: config.in
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/arch/mips/config.in,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- config.in 22 Jun 2002 17:50:58 -0000 1.21
+++ config.in 23 Jul 2002 19:18:47 -0000 1.22
@@ -12,13 +12,13 @@
mainmenu_option next_comment
comment 'Machine selection'
if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
- bool 'Support for Acer PICA 1 chipset' CONFIG_ACER_PICA_61
+ bool 'Support for Acer PICA 1 chipset (EXPERIMENTAL)' CONFIG_ACER_PICA_61
bool 'Support for Algorithmics P4032 (EXPERIMENTAL)' CONFIG_ALGOR_P4032
bool 'Support for BAGET MIPS series (EXPERIMENTAL)' CONFIG_BAGET_MIPS
bool 'Support for DECstations (EXPERIMENTAL)' CONFIG_DECSTATION
bool 'Support for NEC DDB Vrc-5074 (EXPERIMENTAL)' CONFIG_DDB5074
- bool 'Support for Galileo EV96100 Evaluation board' CONFIG_MIPS_EV96100
- bool 'Support for Galileo EV64120 Evaluation board' CONFIG_MIPS_EV64120
+ bool 'Support for Galileo EV96100 Evaluation board (EXPERIMENTAL)' CONFIG_MIPS_EV96100
+ bool 'Support for Galileo EV64120 Evaluation board (EXPERIMENTAL)' CONFIG_MIPS_EV64120
if [ "$CONFIG_MIPS_EV64120" = "y" ]; then
bool 'Enable Second PCI (PCI1)' CONFIG_EVB_PCI1
choice 'Galileo Chip Clock' \
@@ -26,8 +26,8 @@
83.3 CONFIG_SYSCLK_83\
100 CONFIG_SYSCLK_100" CONFIG_SYSCLK_83
fi
- bool 'Support for MIPS Atlas board' CONFIG_MIPS_ATLAS
- bool 'Support for MIPS Malta board' CONFIG_MIPS_MALTA
+ bool 'Support for MIPS Atlas board (EXPERIMENTAL)' CONFIG_MIPS_ATLAS
+ bool 'Support for MIPS Malta board (EXPERIMENTAL)' CONFIG_MIPS_MALTA
bool 'Support for Philips Nino (EXPERIMENTAL)' CONFIG_NINO
if [ "$CONFIG_NINO" = "y" ]; then
choice 'Nino Model Number' \
|
Update of /cvsroot/linuxconsole/ruby/linux/arch/ppc/platforms
In directory usw-pr-cvs1:/tmp/cvs-serv31846/linux/arch/ppc/platforms
Modified Files:
chrp_setup.c pmac_setup.c prep_setup.c
Removed Files:
gemini_setup.c iSeries_setup.c oak_setup.c sandpoint_setup.c
spruce_setup.c
Log Message:
Synced to 2.5.26
Index: chrp_setup.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/arch/ppc/platforms/chrp_setup.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- chrp_setup.c 10 Jul 2002 18:08:02 -0000 1.6
+++ chrp_setup.c 23 Jul 2002 19:18:48 -0000 1.7
@@ -36,6 +36,7 @@
#include <linux/delay.h>
#include <linux/ide.h>
#include <linux/irq.h>
+#include <linux/console.h>
#include <linux/seq_file.h>
#include <linux/root_dev.h>
@@ -67,6 +68,7 @@
void btext_progress(char *, unsigned short);
extern unsigned long pmac_find_end_of_memory(void);
+extern void select_adb_keyboard(void);
extern int of_show_percpuinfo(struct seq_file *, int);
extern kdev_t boot_dev;
@@ -371,6 +373,9 @@
int i;
unsigned long chrp_int_ack;
unsigned char init_senses[NR_IRQS - NUM_8259_INTERRUPTS];
+#if defined(CONFIG_VT) && defined(CONFIG_INPUT_ADBHID) && defined(XMON)
+ struct device_node *kbd;
+#endif
for (np = find_devices("pci"); np != NULL; np = np->next) {
unsigned int *addrp = (unsigned int *)
@@ -395,6 +400,17 @@
for (i = 0; i < NUM_8259_INTERRUPTS; i++)
irq_desc[i].handler = &i8259_pic;
i8259_init(chrp_int_ack);
+
+#if defined(CONFIG_VT) && defined(CONFIG_INPUT_ADBHID) && defined(XMON)
+ /* see if there is a keyboard in the device tree
+ with a parent of type "adb" */
+ for (kbd = find_devices("keyboard"); kbd; kbd = kbd->next)
+ if (kbd->parent && kbd->parent->type
+ && strcmp(kbd->parent->type, "adb") == 0)
+ break;
+ if (kbd)
+ request_irq(HYDRA_INT_ADB_NMI, xmon_irq, 0, "XMON break", 0);
+#endif
}
void __init
@@ -414,6 +430,22 @@
if (ppc_md.progress)
ppc_md.progress(" Have fun! ", 0x7777);
+
+#if defined(CONFIG_VT) && defined(CONFIG_INPUT)
+ /* see if there is a keyboard in the device tree
+ with a parent of type "adb" */
+ {
+ struct device_node *kbd;
+
+ for (kbd = find_devices("keyboard"); kbd; kbd = kbd->next) {
+ if (kbd->parent && kbd->parent->type
+ && strcmp(kbd->parent->type, "adb") == 0) {
+ select_adb_keyboard();
+ break;
+ }
+ }
+ }
+#endif /* CONFIG_VT && CONFIG_INPUT */
}
void __init
Index: pmac_setup.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/arch/ppc/platforms/pmac_setup.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- pmac_setup.c 18 Jun 2002 18:51:54 -0000 1.4
+++ pmac_setup.c 23 Jul 2002 19:18:48 -0000 1.5
@@ -44,6 +44,8 @@
#include <linux/ioport.h>
#include <linux/major.h>
#include <linux/blk.h>
+#include <linux/vt_kern.h>
+#include <linux/console.h>
#include <linux/ide.h>
#include <linux/pci.h>
#include <linux/adb.h>
@@ -64,6 +66,7 @@
#include <asm/ohare.h>
#include <asm/mediabay.h>
#include <asm/machdep.h>
+#include <asm/keyboard.h>
#include <asm/dma.h>
#include <asm/bootx.h>
#include <asm/cputable.h>
@@ -84,6 +87,7 @@
extern void pmac_find_bridges(void);
extern int pmac_ide_check_base(ide_ioreg_t base);
extern ide_ioreg_t pmac_ide_get_base(int index);
+
extern void pmac_nvram_update(void);
extern unsigned char pmac_nvram_read_byte(int addr);
extern void pmac_nvram_write_byte(int addr, unsigned char val);
@@ -305,6 +309,9 @@
#endif
#ifdef CONFIG_NVRAM
pmac_nvram_init();
+#endif
+#ifdef CONFIG_DUMMY_CONSOLE
+ conswitchp = &dummy_con;
#endif
#ifdef CONFIG_BLK_DEV_INITRD
if (initrd_start)
Index: prep_setup.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/arch/ppc/platforms/prep_setup.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- prep_setup.c 10 Jul 2002 18:08:02 -0000 1.6
+++ prep_setup.c 23 Jul 2002 19:18:48 -0000 1.7
@@ -386,9 +386,6 @@
#ifdef CONFIG_VGA_CONSOLE
/* vgacon.c needs to know where we mapped IO memory in io_block_mapping() */
vgacon_remap_base = 0xf0000000;
- conswitchp = &vga_con;
-#elif defined(CONFIG_DUMMY_CONSOLE)
- conswitchp = &dummy_con;
#endif
}
--- gemini_setup.c DELETED ---
--- iSeries_setup.c DELETED ---
--- oak_setup.c DELETED ---
--- sandpoint_setup.c DELETED ---
--- spruce_setup.c DELETED ---
|
|
From: James S. <jsi...@us...> - 2002-07-23 19:19:24
|
Update of /cvsroot/linuxconsole/ruby/linux/drivers/char
In directory usw-pr-cvs1:/tmp/cvs-serv31846/linux/drivers/char
Modified Files:
Config.in
Log Message:
Synced to 2.5.26
Index: Config.in
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/char/Config.in,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- Config.in 22 Jun 2002 17:50:58 -0000 1.42
+++ Config.in 23 Jul 2002 19:18:49 -0000 1.43
@@ -14,27 +14,25 @@
fi
fi
-if [ "$CONFIG_UART" = "n" ]; then
- tristate 'Standard/generic (8250/16550 and compatible UARTs) serial support' CONFIG_SERIAL
- if [ "$CONFIG_SERIAL" = "y" ]; then
- bool ' Support for console on serial port' CONFIG_SERIAL_CONSOLE
- if [ "$CONFIG_ARCH_ACORN" = "y" ]; then
- tristate ' Atomwide serial port support' CONFIG_ATOMWIDE_SERIAL
- tristate ' Dual serial port support' CONFIG_DUALSP_SERIAL
- fi
- fi
- if [ "$CONFIG_ACPI" = "y" -a "$CONFIG_IA64" = "y" ]; then
- bool ' Support for serial ports defined by ACPI tables' CONFIG_SERIAL_ACPI
- fi
- dep_mbool 'Extended dumb serial driver options' CONFIG_SERIAL_EXTENDED $CONFIG_SERIAL
- if [ "$CONFIG_SERIAL_EXTENDED" = "y" ]; then
- bool ' Support more than 4 serial ports' CONFIG_SERIAL_MANY_PORTS
- bool ' Support for sharing serial interrupts' CONFIG_SERIAL_SHARE_IRQ
- bool ' Autodetect IRQ on standard ports (unsafe)' CONFIG_SERIAL_DETECT_IRQ
- bool ' Support special multiport boards' CONFIG_SERIAL_MULTIPORT
- bool ' Support the Bell Technologies HUB6 card' CONFIG_HUB6
+tristate 'Standard/generic (8250/16550 and compatible UARTs) serial support' CONFIG_SERIAL
+if [ "$CONFIG_SERIAL" = "y" ]; then
+ bool ' Support for console on serial port' CONFIG_SERIAL_CONSOLE
+ if [ "$CONFIG_ARCH_ACORN" = "y" ]; then
+ tristate ' Atomwide serial port support' CONFIG_ATOMWIDE_SERIAL
+ tristate ' Dual serial port support' CONFIG_DUALSP_SERIAL
fi
fi
+if [ "$CONFIG_ACPI" = "y" -a "$CONFIG_IA64" = "y" ]; then
+ bool ' Support for serial ports defined by ACPI tables' CONFIG_SERIAL_ACPI
+fi
+dep_mbool 'Extended dumb serial driver options' CONFIG_SERIAL_EXTENDED $CONFIG_SERIAL
+if [ "$CONFIG_SERIAL_EXTENDED" = "y" ]; then
+ bool ' Support more than 4 serial ports' CONFIG_SERIAL_MANY_PORTS
+ bool ' Support for sharing serial interrupts' CONFIG_SERIAL_SHARE_IRQ
+ bool ' Autodetect IRQ on standard ports (unsafe)' CONFIG_SERIAL_DETECT_IRQ
+ bool ' Support special multiport boards' CONFIG_SERIAL_MULTIPORT
+ bool ' Support the Bell Technologies HUB6 card' CONFIG_HUB6
+fi
bool 'Non-standard serial port support' CONFIG_SERIAL_NONSTANDARD
if [ "$CONFIG_SERIAL_NONSTANDARD" = "y" ]; then
tristate ' Computone IntelliPort Plus serial support' CONFIG_COMPUTONE
@@ -84,8 +82,6 @@
bool 'Enable Qtronix 990P Keyboard Support' CONFIG_QTRONIX_KEYBOARD
if [ "$CONFIG_QTRONIX_KEYBOARD" = "y" ]; then
define_bool CONFIG_IT8172_CIR y
- else
- bool ' Enable PS2 Keyboard Support' CONFIG_PC_KEYB
fi
bool 'Enable Smart Card Reader 0 Support ' CONFIG_IT8172_SCR0
bool 'Enable Smart Card Reader 1 Support ' CONFIG_IT8172_SCR1
@@ -93,7 +89,15 @@
if [ "$CONFIG_EXPERIMENTAL" = "y" -a "$CONFIG_ZORRO" = "y" ]; then
tristate 'Commodore A2232 serial support (EXPERIMENTAL)' CONFIG_A2232
fi
-
+if [ "$CONFIG_FOOTBRIDGE" = "y" ]; then
+ bool 'DC21285 serial port support' CONFIG_SERIAL_21285
+ if [ "$CONFIG_SERIAL_21285" = "y" ]; then
+ if [ "$CONFIG_OBSOLETE" = "y" ]; then
+ bool ' Use /dev/ttyS0 device (OBSOLETE)' CONFIG_SERIAL_21285_OLD
+ fi
+ bool ' Console on DC21285 serial port' CONFIG_SERIAL_21285_CONSOLE
+ fi
+fi
bool 'Unix98 PTY support' CONFIG_UNIX98_PTYS
if [ "$CONFIG_UNIX98_PTYS" = "y" ]; then
int 'Maximum number of Unix98 PTYs in use (0-2048)' CONFIG_UNIX98_PTY_COUNT 256
@@ -165,7 +169,9 @@
tristate 'NetWinder flash support' CONFIG_NWFLASH
fi
-dep_tristate 'Intel i8x0 Random Number Generator support' CONFIG_INTEL_RNG $CONFIG_PCI
+if [ "$CONFIG_X86" = "y" -o "$CONFIG_IA64" = "y" ]; then
+ dep_tristate 'Intel i8x0 Random Number Generator support' CONFIG_INTEL_RNG $CONFIG_PCI
+fi
tristate '/dev/nvram support' CONFIG_NVRAM
tristate 'Enhanced Real Time Clock Support' CONFIG_RTC
if [ "$CONFIG_IA64" = "y" ]; then
|
|
From: James S. <jsi...@us...> - 2002-07-23 19:19:24
|
Update of /cvsroot/linuxconsole/ruby/linux/arch/ppc
In directory usw-pr-cvs1:/tmp/cvs-serv31846/linux/arch/ppc
Modified Files:
Config.help config.in
Log Message:
Synced to 2.5.26
Index: Config.help
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/arch/ppc/Config.help,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Config.help 10 Jul 2002 18:08:02 -0000 1.7
+++ Config.help 23 Jul 2002 19:18:48 -0000 1.8
@@ -280,19 +280,6 @@
answer will get "defaulted" for you if you enable any of the Linux
CD-ROM drivers).
-CONFIG_INPUT_ADBHID
- Say Y here if you want to have ADB (Apple Desktop Bus) HID devices
- such as keyboards, mice, joysticks, or graphic tablets handled by
- the input layer. If you say Y here, make sure to say Y to the
- corresponding drivers "Keyboard support" (CONFIG_INPUT_KEYBDEV),
- "Mouse Support" (CONFIG_INPUT_MOUSEDEV) and "Event interface
- support" (CONFIG_INPUT_EVDEV) as well.
-
- If you say N here, you still have the option of using the old ADB
- keyboard and mouse drivers.
-
- If unsure, say Y.
-
CONFIG_PREP_RESIDUAL
Some PReP systems have residual data passed to the kernel by the
firmware. This allows detection of memory size, devices present and
@@ -341,6 +328,27 @@
also includes a MESH II SCSI controller, DBDMA controller, VIA chip,
OpenPIC controller and two RS422/Geoports.)
+CONFIG_INPUT_ADBHID
+ Say Y here if you want to have ADB (Apple Desktop Bus) HID devices
+ such as keyboards, mice, joysticks, trackpads or graphic tablets
+ handled by the input layer. If you say Y here, make sure to say Y to
+ the corresponding drivers "Keyboard support" (CONFIG_INPUT_KEYBDEV),
+ "Mouse Support" (CONFIG_INPUT_MOUSEDEV) and "Event interface
+ support" (CONFIG_INPUT_EVDEV) as well.
+
+ If unsure, say Y.
+
+CONFIG_MAC_EMUMOUSEBTN
+ This provides generic support for emulating the 2nd and 3rd mouse
+ button with keypresses. If you say Y here, the emulation is still
+ disabled by default. The emulation is controlled by these sysctl
+ entries:
+ /proc/sys/dev/mac_hid/mouse_button_emulation
+ /proc/sys/dev/mac_hid/mouse_button2_keycode
+ /proc/sys/dev/mac_hid/mouse_button3_keycode
+
+ If you have an Apple machine with a 1-button mouse, say Y here.
+
CONFIG_SERIAL_CONSOLE
If you say Y here, it will be possible to use a serial port as the
system console (the system console is the device which receives all
@@ -800,28 +808,6 @@
Date of Release: early 2001 (?)
End of life: -
URL: <http://www.microsys.de/html/cu824.html>
-
-CONFIG_MAC_ADBKEYCODES
- This provides support for sending ADB keycodes to console devices in
- raw mode, rather than generic "Linux" keycodes. This is the default
- up to 2.4.0, but in future this may be phased out in favor of
- generic Linux keycodes. If you say Y here, you can dynamically
- switch via the /proc/sys/dev/mac_hid/keyboard_sends_linux_keycodes
- sysctl and with the "keyboard_sends_linux_keycodes=" kernel
- argument.
-
- If unsure, say Y here.
-
-CONFIG_MAC_EMUMOUSEBTN
- This provides generic support for emulating the 2nd and 3rd mouse
- button with keypresses. If you say Y here, the emulation is still
- disabled by default. The emulation is controlled by these sysctl
- entries:
- /proc/sys/dev/mac_hid/mouse_button_emulation
- /proc/sys/dev/mac_hid/mouse_button2_keycode
- /proc/sys/dev/mac_hid/mouse_button3_keycode
-
- If you have an Apple machine with a 1-button mouse, say Y here.
CONFIG_PPC_RTC
If you say Y here and create a character special file /dev/rtc with
Index: config.in
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/arch/ppc/config.in,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- config.in 10 Jul 2002 18:08:02 -0000 1.35
+++ config.in 23 Jul 2002 19:18:48 -0000 1.36
@@ -378,7 +378,7 @@
define_bool CONFIG_AMIGA y
define_bool CONFIG_ZORRO y
define_bool CONFIG_INPUT y
- define_bool CONFIG_INPUT_MOUSE y
+ define_bool CONFIG_INPUT_MOUSE y
define_bool CONFIG_MOUSE_AMIGA y
define_bool CONFIG_ABSTRACT_CONSOLE y
define_bool CONFIG_FB y
@@ -526,12 +526,9 @@
bool 'Apple Desktop Bus (ADB) support' CONFIG_ADB
if [ "$CONFIG_ADB" = "y" ]; then
bool ' Include MacIO (CHRP) ADB driver' CONFIG_ADB_MACIO
- dep_bool ' Use input layer for ADB devices' CONFIG_INPUT_ADBHID $CONFIG_INPUT
+ dep_bool ' Support for ADB input devices (keyboard, mice, ...)' CONFIG_INPUT_ADBHID $CONFIG_INPUT
if [ "$CONFIG_INPUT_ADBHID" = "y" ]; then
- bool ' Support for ADB raw keycodes' CONFIG_MAC_ADBKEYCODES
bool ' Support for mouse button 2+3 emulation' CONFIG_MAC_EMUMOUSEBTN
- else
- bool ' Support for ADB keyboard (old driver)' CONFIG_ADB_KEYBOARD
fi
fi
# This is for drivers/macintosh/mac_hid.o, which is needed if the input
|
|
From: James S. <jsi...@us...> - 2002-07-23 19:19:24
|
Update of /cvsroot/linuxconsole/ruby/linux/arch/sh
In directory usw-pr-cvs1:/tmp/cvs-serv31846/linux/arch/sh
Modified Files:
config.in
Log Message:
Synced to 2.5.26
Index: config.in
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/arch/sh/config.in,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- config.in 22 Mar 2002 20:13:58 -0000 1.20
+++ config.in 23 Jul 2002 19:18:48 -0000 1.21
@@ -175,7 +175,7 @@
if [ "$CONFIG_PCI_GODIRECT" = "y" -o "$CONFIG_PCI_GOANY" = "y" ]; then
define_bool CONFIG_PCI_DIRECT y
fi
- bool 'Cache and PCI noncoherent' CONFIG_SH_PCIDMA_NONCOHERENT n
+ bool 'Cache and PCI noncoherent' CONFIG_SH_PCIDMA_NONCOHERENT
fi
source drivers/pci/Config.in
|
|
From: James S. <jsi...@us...> - 2002-07-23 19:19:23
|
Update of /cvsroot/linuxconsole/ruby/linux/arch/parisc In directory usw-pr-cvs1:/tmp/cvs-serv31846/linux/arch/parisc Modified Files: config.in Log Message: Synced to 2.5.26 Index: config.in =================================================================== RCS file: /cvsroot/linuxconsole/ruby/linux/arch/parisc/config.in,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- config.in 22 Jun 2002 17:50:58 -0000 1.7 +++ config.in 23 Jul 2002 19:18:47 -0000 1.8 @@ -24,14 +24,14 @@ # bool 'GSC/Gecko bus support' CONFIG_GSC y define_bool CONFIG_GSC y -bool 'U2/Uturn I/O MMU' CONFIG_IOMMU_CCIO y -bool 'LASI I/O support' CONFIG_GSC_LASI y +bool 'U2/Uturn I/O MMU' CONFIG_IOMMU_CCIO +bool 'LASI I/O support' CONFIG_GSC_LASI -bool 'PCI support' CONFIG_PCI y +bool 'PCI support' CONFIG_PCI if [ "$CONFIG_PCI" = "y" ]; then - bool 'GSCtoPCI/DINO PCI support' CONFIG_GSC_DINO y - bool 'LBA/Elroy PCI support' CONFIG_PCI_LBA n + bool 'GSCtoPCI/DINO PCI support' CONFIG_GSC_DINO + bool 'LBA/Elroy PCI support' CONFIG_PCI_LBA fi if [ "$CONFIG_PCI_LBA" = "y" ]; then |
5 messages has been excluded from this view by a project administrator.
