[parisc-linux-cvs] 2.4.18-pa45: activated HIL KEYBOARD and HIL MOUSE by DEFAULT
Helge Deller
deller@gmx.de
Sun, 30 Jun 2002 17:01:51 +0200
--Boundary-00=_f1xH99uiYgxYw5V
Content-Type: text/plain;
charset="iso-8859-1"
Content-Transfer-Encoding: 8bit
Content-Disposition: inline
On Sunday 30 June 2002 17:00, Helge Deller wrote:
> CVSROOT: /var/cvs
> Module name: linux
> Changes by: deller 02/06/30 09:00:12
>
> Modified files:
> . : Makefile
> arch/parisc : defconfig
> drivers/hil : hil_kbd.c hil_mlc.c hil_ptr.c hp_sdc.c
> hp_sdc_mlc.c hp_sdc_rtc.c
> include/linux : hil.h
> arch/parisc/debian-configs: 32 32-smp 64 64-smp
>
> Log message:
> linux-2.4.18-pa45:
> - activate HIL KEYBOARD and HIL MOUSE by DEFAULT !!
> - adjusted defconfig and debianconfigs
> - added lots of KERN_XXXX prefixes to printk()s
> - tested HIL mouse and HIL tablet, both work by default.
--Boundary-00=_f1xH99uiYgxYw5V
Content-Type: text/plain;
charset="iso-8859-1";
name="diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline; filename="diff"
Index: Makefile
===================================================================
RCS file: /var/cvs/linux/Makefile,v
retrieving revision 1.315
diff -u -p -r1.315 Makefile
--- Makefile 2002/06/28 06:49:11 1.315
+++ Makefile 2002/06/30 14:55:50
@@ -1,7 +1,7 @@
VERSION = 2
PATCHLEVEL = 4
SUBLEVEL = 18
-EXTRAVERSION = -pa44
+EXTRAVERSION = -pa45
KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
Index: arch/parisc/defconfig
===================================================================
RCS file: /var/cvs/linux/arch/parisc/defconfig,v
retrieving revision 1.53
diff -u -p -r1.53 defconfig
--- arch/parisc/defconfig 2002/06/25 21:45:16 1.53
+++ arch/parisc/defconfig 2002/06/30 14:55:52
@@ -14,7 +14,9 @@ CONFIG_EXPERIMENTAL=y
#
# Loadable module support
#
-# CONFIG_MODULES is not set
+CONFIG_MODULES=y
+# CONFIG_MODVERSIONS is not set
+CONFIG_KMOD=y
#
# Processor type
@@ -536,19 +538,21 @@ CONFIG_GENRTC=y
# HIL support
#
CONFIG_HIL=y
-CONFIG_HIL_KBD_BASIC=y
+# CONFIG_HIL_KBD_BASIC is not set
#
# HIL driver core support
#
-# CONFIG_HP_SDC is not set
+CONFIG_HP_SDC=y
# CONFIG_HP_SDC_RTC is not set
-# CONFIG_HIL_MLC is not set
-# CONFIG_HP_SDC_MLC is not set
+CONFIG_HIL_MLC=y
+CONFIG_HP_SDC_MLC=y
#
# HIL device driver
#
+CONFIG_HIL_KBD=y
+CONFIG_HIL_PTR=y
#
# Multimedia devices
@@ -781,6 +785,11 @@ CONFIG_SOUND_HARMONY=y
#
# USB Human Interface Devices (HID)
#
+# CONFIG_USB_HID is not set
+# CONFIG_USB_HIDDEV is not set
+# CONFIG_USB_KBD is not set
+# CONFIG_USB_MOUSE is not set
+# CONFIG_USB_WACOM is not set
#
# USB Imaging devices
Index: drivers/hil/hil_kbd.c
===================================================================
RCS file: /var/cvs/linux/drivers/hil/hil_kbd.c,v
retrieving revision 1.1
diff -u -p -r1.1 hil_kbd.c
--- drivers/hil/hil_kbd.c 2002/06/25 19:53:07 1.1
+++ drivers/hil/hil_kbd.c 2002/06/30 14:55:52
@@ -39,6 +39,7 @@
#include <linux/init.h>
#include <linux/slab.h>
+#define PREFIX "HIL KEYB: "
#define HIL_GENERIC_NAME "generic HIL keyboard device"
MODULE_AUTHOR("Brian S. Julin <bri@calyx.com>");
@@ -163,7 +164,7 @@ static void hil_kbd_process_record(struc
/* These occur when device isn't present */
if (p == (HIL_ERR_INT | HIL_PKT_CMD)) break;
/* Anything else we'd like to know about. */
- printk("Device sent unknown record %x\n", p);
+ printk(KERN_WARNING PREFIX "Device sent unknown record %x\n", p);
break;
}
goto out;
@@ -223,7 +224,7 @@ static void hil_kbd_process_record(struc
}
static void hil_kbd_process_err(struct hil_kbd *kbd) {
- printk("errored HIL packet\n");
+ printk(KERN_WARNING PREFIX "errored HIL packet\n");
kbd->idx4 = 0;
up(&kbd->sem);
return;
@@ -330,7 +331,7 @@ static void hil_kbd_connect(struct serio
case HIL_IDD_DID_TYPE_KB_ITF:
case HIL_IDD_DID_TYPE_KB_RSVD:
case HIL_IDD_DID_TYPE_CHAR:
- printk("HIL keyboard found (did = 0x%02x, lang = %s)\n",
+ printk(KERN_INFO PREFIX "HIL keyboard found (did = 0x%02x, lang = %s)\n",
did, hil_language[did & HIL_IDD_DID_TYPE_KB_LANG_MASK]);
break;
default:
@@ -338,7 +339,7 @@ static void hil_kbd_connect(struct serio
}
if(HIL_IDD_NUM_BUTTONS(idd) || HIL_IDD_NUM_AXES_PER_SET(*idd)) {
- printk("keyboards only, no combo devices supported.\n");
+ printk(KERN_INFO PREFIX "keyboards only, no combo devices supported.\n");
goto bail1;
}
@@ -376,14 +377,12 @@ struct serio_dev hil_kbd_serio_dev = {
static int __init hil_kbd_init(void)
{
serio_register_device(&hil_kbd_serio_dev);
- printk(HIL_GENERIC_NAME " support loaded.\n");
return 0;
}
static void __exit hil_kbd_exit(void)
{
serio_unregister_device(&hil_kbd_serio_dev);
- printk(HIL_GENERIC_NAME " support unloaded.\n");
}
module_init(hil_kbd_init);
Index: drivers/hil/hil_mlc.c
===================================================================
RCS file: /var/cvs/linux/drivers/hil/hil_mlc.c,v
retrieving revision 1.4
diff -u -p -r1.4 hil_mlc.c
--- drivers/hil/hil_mlc.c 2002/06/28 06:42:07 1.4
+++ drivers/hil/hil_mlc.c 2002/06/30 14:55:57
@@ -69,6 +69,8 @@ MODULE_LICENSE("Dual BSD/GPL");
EXPORT_SYMBOL(hil_mlc_register);
EXPORT_SYMBOL(hil_mlc_unregister);
+#define PREFIX "HIL MLC: "
+
static LIST_HEAD(hil_mlcs);
static rwlock_t hil_mlcs_lock = RW_LOCK_UNLOCKED;
static struct timer_list hil_mlcs_kicker;
@@ -221,7 +223,7 @@ static int hilse_match(hil_mlc *mlc, int
rc = hil_mlc_find_free_di(mlc);
if (rc == -1) goto err;
#ifdef HIL_MLC_DEBUG
- printk("new in slot %i\n", rc);
+ printk(KERN_DEBUG PREFIX "new in slot %i\n", rc);
#endif
hil_mlc_copy_di_scratch(mlc, rc);
mlc->di_map[mlc->ddi] = rc;
@@ -232,13 +234,13 @@ static int hilse_match(hil_mlc *mlc, int
}
mlc->di_map[mlc->ddi] = rc;
#ifdef HIL_MLC_DEBUG
- printk("same in slot %i\n", rc);
+ printk(KERN_DEBUG PREFIX "same in slot %i\n", rc);
#endif
mlc->serio_map[rc].di_revmap = mlc->ddi;
hil_mlc_clean_serio_map(mlc);
return 0;
err:
- printk("Residual device slots exhausted, close some serios!\n");
+ printk(KERN_ERR PREFIX "Residual device slots exhausted, close some serios!\n");
return 1;
}
@@ -370,7 +372,7 @@ static int hilse_take_rnm(hil_mlc *mlc,
char nam[17];
snprintf(nam, 16, "%s", mlc->di_scratch.rnm);
nam[16] = '\0';
- printk("Device name gotten: %s\n", nam);
+ printk(KERN_INFO PREFIX "Device name gotten: %s\n", nam);
} while (0);
return 0;
}
@@ -573,7 +575,7 @@ static int hilse_donode (hil_mlc *mlc) {
#ifdef HIL_MLC_DEBUG
if (mlc->seidx && (mlc->seidx != seidx) && mlc->seidx != 41 && mlc->seidx != 42 && mlc->seidx != 43) {
- printk("z%i \n%s {%i}", doze, kick ? "K" : "", mlc->seidx);
+ printk(KERN_DEBUG PREFIX "z%i \n%s {%i}", doze, kick ? "K" : "", mlc->seidx);
doze = 0;
}
kick = 0;
@@ -606,9 +608,6 @@ static int hilse_donode (hil_mlc *mlc) {
write_unlock_irqrestore(&(mlc->lock), flags);
break;
}
-#ifdef HIL_MLC_DEBUG
- if (rc == 1) printk("ugly");
-#endif
if (rc == 1) nextidx = node->ugly;
else if (rc == 0) nextidx = node->good;
else nextidx = node->bad;
@@ -684,7 +683,7 @@ static int hilse_donode (hil_mlc *mlc) {
mod_timer(&hil_mlcs_kicker, jiffies + tv.tv_usec);
break;
sched:
- hil_tasklet_schedule(&hil_mlcs_tasklet);
+ tasklet_schedule(&hil_mlcs_tasklet);
break;
}
if (nextidx & HILSEN_DOWN) mlc->seidx += nextidx & HILSEN_MASK;
@@ -707,7 +706,7 @@ static void hil_mlcs_process(unsigned lo
if (mlc->seidx != 41 &&
mlc->seidx != 42 &&
mlc->seidx != 43)
- printk(" + ");
+ printk(KERN_DEBUG PREFIX " + ");
#endif
};
}
@@ -718,7 +717,7 @@ static void hil_mlcs_process(unsigned lo
void hil_mlcs_timer (unsigned long data) {
hil_mlcs_probe = 1;
- hil_tasklet_schedule(&hil_mlcs_tasklet);
+ tasklet_schedule(&hil_mlcs_tasklet);
/* Re-insert the periodic task. */
if (!timer_pending(&hil_mlcs_kicker))
mod_timer(&hil_mlcs_kicker, jiffies + HZ);
@@ -891,8 +890,7 @@ int hil_mlc_register(hil_mlc *mlc) {
mlc->seidx = HILSEN_START;
write_unlock_irqrestore(&hil_mlcs_lock, flags);
- printk("Registered MLC %p\n", mlc);
- hil_tasklet_schedule(&hil_mlcs_tasklet);
+ tasklet_schedule(&hil_mlcs_tasklet);
return 0;
}
@@ -912,7 +910,7 @@ int hil_mlc_unregister(hil_mlc *mlc) {
/* not found in list */
write_unlock_irqrestore(&hil_mlcs_lock, flags);
- hil_tasklet_schedule(&hil_mlcs_tasklet);
+ tasklet_schedule(&hil_mlcs_tasklet);
return -ENODEV;
found:
@@ -923,8 +921,7 @@ int hil_mlc_unregister(hil_mlc *mlc) {
for (i = 0; i < HIL_MLC_DEVMEM; i++)
serio_unregister_port(&(mlc->serio[i]));
- printk("Unregistered MLC %p\n", mlc);
- hil_tasklet_schedule(&hil_mlcs_tasklet);
+ tasklet_schedule(&hil_mlcs_tasklet);
return 0;
}
@@ -932,8 +929,6 @@ int hil_mlc_unregister(hil_mlc *mlc) {
static int __init hil_mlc_init(void)
{
- printk("HIL MLC support infrastructure loaded.\n");
-
init_timer(&hil_mlcs_kicker);
hil_mlcs_kicker.expires = jiffies + HZ;
hil_mlcs_kicker.function = &hil_mlcs_timer;
@@ -950,8 +945,6 @@ static void __exit hil_mlc_exit(void)
tasklet_disable(&hil_mlcs_tasklet);
tasklet_kill(&hil_mlcs_tasklet);
-
- printk("HIL MLC support infrastructure unloaded.\n");
}
module_init(hil_mlc_init);
Index: drivers/hil/hil_ptr.c
===================================================================
RCS file: /var/cvs/linux/drivers/hil/hil_ptr.c,v
retrieving revision 1.1
diff -u -p -r1.1 hil_ptr.c
--- drivers/hil/hil_ptr.c 2002/06/25 19:53:07 1.1
+++ drivers/hil/hil_ptr.c 2002/06/30 14:56:03
@@ -39,12 +39,18 @@
#include <linux/init.h>
#include <linux/slab.h>
+#define PREFIX "HIL PTR: "
#define HIL_GENERIC_NAME "generic HIL pointer device"
MODULE_AUTHOR("Brian S. Julin <bri@calyx.com>");
MODULE_DESCRIPTION(HIL_GENERIC_NAME " driver");
MODULE_LICENSE("Dual BSD/GPL");
+
+#define TABLET_SIMULATES_MOUSE /* allow tablet to be used as mouse */
+#undef TABLET_AUTOADJUST /* auto-adjust valid tablet ranges */
+
+
#define HIL_PTR_MAX_LENGTH 16
struct hil_ptr {
@@ -76,6 +82,7 @@ static void hil_ptr_process_record(struc
hil_packet *data = ptr->data;
hil_packet p;
int idx, i, cnt, laxis;
+ int ax16, absdev;
idx = ptr->idx4/4;
p = data[idx - 1];
@@ -115,55 +122,45 @@ static void hil_ptr_process_record(struc
/* These occur when device isn't present */
if (p == (HIL_ERR_INT | HIL_PKT_CMD)) break;
/* Anything else we'd like to know about. */
- printk("Device sent unknown record %x\n", p);
+ printk(KERN_WARNING PREFIX "Device sent unknown record %x\n", p);
break;
}
goto out;
report:
if ((p & HIL_CMDCT_POL) != idx - 1) {
- printk("Malformed poll packet %x (idx = %i)\n", p, idx);
+ printk(KERN_WARNING PREFIX "Malformed poll packet %x (idx = %i)\n", p, idx);
goto out;
}
i = (ptr->data[0] & HIL_POL_AXIS_ALT) ? 3 : 0;
laxis = ptr->data[0] & HIL_POL_NUM_AXES_MASK;
laxis += i;
-
- if (ptr->idd[1] & HIL_IDD_HEADER_16BIT) goto ax16;
- if ((ptr->idd[0] & HIL_IDD_DID_TYPE_MASK) == HIL_IDD_DID_TYPE_REL)
- goto rel8;
- for (cnt = 1; i < laxis; i++)
- input_report_abs(dev, ABS_X + i,
- ptr->data[cnt++] & HIL_PKT_DATA_MASK);
- goto buttons;
+ ax16 = ptr->idd[1] & HIL_IDD_HEADER_16BIT; /* 8 or 16bit resolution */
+ absdev = ptr->idd[1] & HIL_IDD_HEADER_ABS;
- rel8:
- for (cnt = 1; i < laxis; i++) {
- int val = (cnt % 3 == 2) ? -1 : 1;
- val *= (int8_t)(ptr->data[cnt++] & HIL_PKT_DATA_MASK);
- input_report_rel(dev, REL_X + i, val);
- }
- goto buttons;
-
- ax16:
- if ((ptr->idd[0] & HIL_IDD_DID_TYPE_MASK) == HIL_IDD_DID_TYPE_REL)
- goto rel16;
- for (cnt = 1; i < laxis; i++) {
- unsigned int val = ptr->data[cnt++] & HIL_PKT_DATA_MASK;
- val += (ptr->data[cnt++] & HIL_PKT_DATA_MASK) << 8;
- input_report_abs(dev, ABS_X + i, val);
- }
- goto buttons;
- rel16:
for (cnt = 1; i < laxis; i++) {
- unsigned int val = ptr->data[cnt++] & HIL_PKT_DATA_MASK;
- val += (ptr->data[cnt++] & HIL_PKT_DATA_MASK) << 8;
- input_report_rel(dev, REL_X + i, (int16_t)val);
+ unsigned int lo,hi,val;
+ lo = ptr->data[cnt++] & HIL_PKT_DATA_MASK;
+ hi = ax16 ? (ptr->data[cnt++] & HIL_PKT_DATA_MASK) : 0;
+ if (absdev) {
+ val = lo + (hi<<8);
+#ifdef TABLET_AUTOADJUST
+ if (val < ptr->dev.absmin[ABS_X + i])
+ ptr->dev.absmin[ABS_X + i] = val;
+ if (val > ptr->dev.absmax[ABS_X + i])
+ ptr->dev.absmax[ABS_X + i] = val;
+#endif
+ if (i%3) val = ptr->dev.absmax[ABS_X + i] - val;
+ input_report_abs(dev, ABS_X + i, val);
+ } else {
+ val = (int) (((int8_t)lo) | ((int8_t)hi<<8));
+ if (i%3) val *= -1;
+ input_report_rel(dev, REL_X + i, val);
+ }
}
- buttons:
while (cnt < idx - 1) {
unsigned int btn;
int up;
@@ -184,7 +181,7 @@ static void hil_ptr_process_record(struc
}
static void hil_ptr_process_err(struct hil_ptr *ptr) {
- printk("errored HIL packet\n");
+ printk(KERN_WARNING PREFIX "errored HIL packet\n");
ptr->idx4 = 0;
up(&ptr->sem);
return;
@@ -220,7 +217,8 @@ static void hil_ptr_interrupt(struct ser
hil_ptr_process_err(ptr);
return;
}
- if (packet & HIL_PKT_CMD) hil_ptr_process_record(ptr);
+ if (packet & HIL_PKT_CMD)
+ hil_ptr_process_record(ptr);
}
static void hil_ptr_disconnect(struct serio *serio)
@@ -307,15 +305,21 @@ static void hil_ptr_connect(struct serio
naxsets = HIL_IDD_NUM_AXSETS(*idd);
ptr->naxes = HIL_IDD_NUM_AXES_PER_SET(*idd);
- printk("HIL pointer device found (did: 0x%02x, axis: %s)\n",
+ printk(KERN_INFO PREFIX "HIL pointer device found (did: 0x%02x, axis: %s)\n",
did, txt);
- printk("HIL pointer has %i buttons and %i sets of %i axes\n",
+ printk(KERN_INFO PREFIX "HIL pointer has %i buttons and %i sets of %i axes\n",
ptr->nbtn, naxsets, ptr->naxes);
btntype = BTN_MISC;
if ((did & HIL_IDD_DID_ABS_TABLET_MASK) == HIL_IDD_DID_ABS_TABLET)
+#ifdef TABLET_SIMULATES_MOUSE
+ btntype = BTN_TOUCH;
+#else
btntype = BTN_DIGI;
- /* TODO: touchscreen ?? */
+#endif
+ if ((did & HIL_IDD_DID_ABS_TSCREEN_MASK) == HIL_IDD_DID_ABS_TSCREEN)
+ btntype = BTN_TOUCH;
+
if ((did & HIL_IDD_DID_REL_MOUSE_MASK) == HIL_IDD_DID_REL_MOUSE)
btntype = BTN_MOUSE;
@@ -324,19 +328,10 @@ static void hil_ptr_connect(struct serio
ptr->btnmap[i] = btntype | i;
}
- switch (btntype) {
- case BTN_MOUSE:
- printk("Reporting buttons as BTN_MOUSE events.\n");
+ if (btntype == BTN_MOUSE) {
/* Swap buttons 2 and 3 */
ptr->btnmap[1] = BTN_MIDDLE;
ptr->btnmap[2] = BTN_RIGHT;
- break;
- case BTN_DIGI:
- printk("Reporting buttons as BTN_DIGI events.\n");
- break;
- default:
- printk("Reporting buttons as BTN_MISC events.\n");
- break;
}
if ((did & HIL_IDD_DID_TYPE_MASK) == HIL_IDD_DID_TYPE_REL) {
@@ -351,14 +346,21 @@ static void hil_ptr_connect(struct serio
set_bit(ABS_X + i, ptr->dev.absbit);
ptr->dev.absmin[ABS_X + i] = 0;
ptr->dev.absmax[ABS_X + i] =
- HIL_IDD_AXIS_MAX((ptr->data + 1), i);
+ HIL_IDD_AXIS_MAX((ptr->idd + 1), i);
}
for (i = 3; (i < ptr->naxes + 3) && (naxsets > 1); i++) {
set_bit(ABS_X + i, ptr->dev.absbit);
ptr->dev.absmin[ABS_X + i] = 0;
ptr->dev.absmax[ABS_X + i] =
- HIL_IDD_AXIS_MAX((ptr->data + 1), (i - 3));
+ HIL_IDD_AXIS_MAX((ptr->idd + 1), (i - 3));
+ }
+#ifdef TABLET_AUTOADJUST
+ for (i = 0; i < ABS_MAX; i++) {
+ int diff = ptr->dev.absmax[ABS_X + i] / 10;
+ ptr->dev.absmin[ABS_X + i] += diff;
+ ptr->dev.absmax[ABS_X + i] -= diff;
}
+#endif
}
ptr->dev.name = strlen(ptr->rnm) ? ptr->rnm : HIL_GENERIC_NAME;
@@ -387,14 +389,12 @@ struct serio_dev hil_ptr_serio_dev = {
static int __init hil_ptr_init(void)
{
serio_register_device(&hil_ptr_serio_dev);
- printk("HIL generic pointer device support loaded.\n");
return 0;
}
static void __exit hil_ptr_exit(void)
{
serio_unregister_device(&hil_ptr_serio_dev);
- printk("HIL generic pointer device support unloaded.\n");
}
module_init(hil_ptr_init);
Index: drivers/hil/hp_sdc.c
===================================================================
RCS file: /var/cvs/linux/drivers/hil/hp_sdc.c,v
retrieving revision 1.3
diff -u -p -r1.3 hp_sdc.c
--- drivers/hil/hp_sdc.c 2002/06/28 06:49:11 1.3
+++ drivers/hil/hp_sdc.c 2002/06/30 14:56:03
@@ -75,6 +75,8 @@
#include <asm/gsc.h>
+#define PREFIX "HP SDC: "
+
MODULE_AUTHOR("Brian S. Julin <bri@calyx.com>");
MODULE_DESCRIPTION("HP i8042-based SDC Driver");
MODULE_LICENSE("Dual BSD/GPL");
@@ -112,8 +114,6 @@ static inline uint8_t hp_sdc_data_in8 (v
static inline void hp_sdc_status_out8 (uint8_t val) {
unsigned long flags;
- // printk("\nstat < %2.2x (%lu) ", val, mfctl(16));
-
write_lock_irqsave(&hp_sdc.ibf_lock, flags);
hp_sdc.ibf = 1;
if ((val & 0xf0) == 0xe0) hp_sdc.wi = 0xff;
@@ -124,8 +124,6 @@ static inline void hp_sdc_status_out8 (u
static inline void hp_sdc_data_out8 (uint8_t val) {
unsigned long flags;
- // printk("\ndata < %2.2x (%lu) ", val, mfctl(16));
-
write_lock_irqsave(&hp_sdc.ibf_lock, flags);
hp_sdc.ibf = 1;
gsc_writeb(val, hp_sdc.data_io);
@@ -188,7 +186,7 @@ static void hp_sdc_take (int irq, void *
hp_sdc.rcurr = -1;
hp_sdc.rqty = 0;
write_unlock(&hp_sdc.rtq_lock);
- hil_tasklet_schedule(&hp_sdc.task);
+ tasklet_schedule(&hp_sdc.task);
}
}
@@ -203,7 +201,6 @@ static void hp_sdc_isr(int irq, void *de
if (((status & 0xf1) == 0x51) && data == 0x82) {
return;
}
- // printk("\n>[%2.2x,%2.2x] (%lu) ", status, data, mfctl(16));
switch(status & HP_SDC_STATUS_IRQMASK) {
case 0: /* This case is not documented. */
@@ -230,7 +227,7 @@ static void hp_sdc_isr(int irq, void *de
read_lock(&hp_sdc.hook_lock);
if (hp_sdc.pup != NULL)
hp_sdc.pup(irq, dev_id, status, data);
- else printk("HP SDC reports successful PUP.\n");
+ else printk(KERN_INFO PREFIX "HP SDC reports successful PUP.\n");
read_unlock(&hp_sdc.hook_lock);
break;
default:
@@ -247,7 +244,7 @@ static void hp_sdc_nmisr(int irq, void *
int status;
status = hp_sdc_status_in8();
-printk("NMI\n");
+ printk(KERN_WARNING PREFIX "NMI !\n");
#if 0
if (status & HP_SDC_NMISTATUS_FHS) {
@@ -258,7 +255,7 @@ printk("NMI\n");
}
else {
/* TODO: pass this on to the HIL handler, or do SAK here? */
- printk("HIL NMI\n");
+ printk(KERN_WARNING PREFIX "HIL NMI\n");
}
#endif
}
@@ -284,7 +281,7 @@ static void hp_sdc_tasklet(unsigned long
* we'll need to figure out a way to communicate
* it back to the application. and be less verbose.
*/
- printk("HP SDC read timeout (%ius)!\n",
+ printk(KERN_WARNING PREFIX "read timeout (%ius)!\n",
tv.tv_usec - hp_sdc.rtv.tv_usec);
curr->idx += hp_sdc.rqty;
hp_sdc.rqty = 0;
@@ -534,7 +531,7 @@ actdone:
if (!hp_sdc.ibf && limit++ < 20) goto anew;
done:
- if (hp_sdc.wcurr >= 0) hil_tasklet_schedule(&hp_sdc.task);
+ if (hp_sdc.wcurr >= 0) tasklet_schedule(&hp_sdc.task);
write_unlock(&hp_sdc.lock);
return 0;
}
@@ -544,7 +541,7 @@ int hp_sdc_enqueue_transaction(hp_sdc_tr
int i;
if (this == NULL) {
- hil_tasklet_schedule(&hp_sdc.task);
+ tasklet_schedule(&hp_sdc.task);
return -EINVAL;
};
@@ -561,18 +558,18 @@ int hp_sdc_enqueue_transaction(hp_sdc_tr
for (i=0; i < HP_SDC_QUEUE_LEN; i++) {
if (hp_sdc.tq[i] == NULL) {
hp_sdc.tq[i] = this;
- hil_tasklet_schedule(&hp_sdc.task);
+ tasklet_schedule(&hp_sdc.task);
write_unlock_bh(&hp_sdc.lock);
return 0;
}
}
write_unlock_bh(&hp_sdc.lock);
- printk("No free slot to add transaction.\n");
+ printk(KERN_WARNING PREFIX "No free slot to add transaction.\n");
return -EBUSY;
fail:
write_unlock_bh(&hp_sdc.lock);
- printk("Transaction add failed: transaction already queued?\n");
+ printk(KERN_WARNING PREFIX "Transaction add failed: transaction already queued?\n");
return -EINVAL;
}
@@ -615,7 +612,7 @@ int hp_sdc_request_timer_irq(hp_sdc_irqh
hp_sdc.set_im = 1;
write_unlock_irq(&hp_sdc.hook_lock);
- hil_tasklet_schedule(&hp_sdc.task);
+ tasklet_schedule(&hp_sdc.task);
return 0;
}
@@ -639,7 +636,7 @@ int hp_sdc_request_hil_irq(hp_sdc_irqhoo
hp_sdc.set_im = 1;
write_unlock_irq(&hp_sdc.hook_lock);
- hil_tasklet_schedule(&hp_sdc.task);
+ tasklet_schedule(&hp_sdc.task);
return 0;
}
@@ -664,7 +661,7 @@ int hp_sdc_request_cooked_irq(hp_sdc_irq
hp_sdc.set_im = 1;
write_unlock_irq(&hp_sdc.hook_lock);
- hil_tasklet_schedule(&hp_sdc.task);
+ tasklet_schedule(&hp_sdc.task);
return 0;
}
@@ -686,7 +683,7 @@ int hp_sdc_release_timer_irq(hp_sdc_irqh
hp_sdc.im |= HP_SDC_IM_PT;
hp_sdc.set_im = 1;
write_unlock_irq(&hp_sdc.hook_lock);
- hil_tasklet_schedule(&hp_sdc.task);
+ tasklet_schedule(&hp_sdc.task);
MOD_DEC_USE_COUNT;
return 0;
@@ -708,7 +705,7 @@ int hp_sdc_release_hil_irq(hp_sdc_irqhoo
hp_sdc.set_im = 1;
}
write_unlock_irq(&hp_sdc.hook_lock);
- hil_tasklet_schedule(&hp_sdc.task);
+ tasklet_schedule(&hp_sdc.task);
MOD_DEC_USE_COUNT;
return 0;
@@ -730,7 +727,7 @@ int hp_sdc_release_cooked_irq(hp_sdc_irq
hp_sdc.set_im = 1;
}
write_unlock_irq(&hp_sdc.hook_lock);
- hil_tasklet_schedule(&hp_sdc.task);
+ tasklet_schedule(&hp_sdc.task);
MOD_DEC_USE_COUNT;
return 0;
@@ -739,7 +736,7 @@ int hp_sdc_release_cooked_irq(hp_sdc_irq
/************************* Keepalive timer task *********************/
void hp_sdc_kicker (unsigned long data) {
- hil_tasklet_schedule(&hp_sdc.task);
+ tasklet_schedule(&hp_sdc.task);
/* Re-insert the periodic task. */
mod_timer(&hp_sdc.kicker, jiffies + HZ);
}
@@ -832,7 +829,7 @@ static int __init hp_sdc_init(struct par
if (request_irq(hp_sdc.nmi, &hp_sdc_nmisr, 0, "HP SDC NMI",
(void*)d->hpa)) goto err2;
- printk(KERN_INFO "HP SDC at 0x%p, IRQ %d (NMI IRQ %d)\n",
+ printk(KERN_INFO PREFIX "HP SDC at 0x%p, IRQ %d (NMI IRQ %d)\n",
(void *)hp_sdc.base_io, hp_sdc.irq, hp_sdc.nmi);
hp_sdc_status_in8();
@@ -866,8 +863,8 @@ static int __init hp_sdc_init(struct par
err1:
release_region(hp_sdc.data_io, 2);
err0:
- printk(__FILE__ ": %s SDC IO=0x%p IRQ=0x%x NMI=0x%x\n", errstr,
- (void *)hp_sdc.base_io, hp_sdc.irq, hp_sdc.nmi);
+ printk(KERN_WARNING PREFIX ": %s SDC IO=0x%p IRQ=0x%x NMI=0x%x\n",
+ errstr, (void *)hp_sdc.base_io, hp_sdc.irq, hp_sdc.nmi);
hp_sdc.dev = NULL;
return hp_sdc.dev_err;
}
@@ -894,9 +891,7 @@ static void __exit hp_sdc_exit(void)
/* release_region(hp_sdc.data_io, 2); */
if (unregister_parisc_driver(&hp_sdc_driver))
- printk("Error unregistering HP SDC");
-
- printk("HP SDC support unloaded.\n");
+ printk(KERN_WARNING PREFIX "Error unregistering HP SDC");
}
static int __init hp_sdc_register(void)
@@ -908,14 +903,13 @@ static int __init hp_sdc_register(void)
struct semaphore tq_init_sem;
if (register_parisc_driver(&hp_sdc_driver)) {
- printk("Error registering SDC with system bus tree.\n");
+ printk(KERN_WARNING PREFIX "Error registering SDC with system bus tree.\n");
return -ENODEV;
}
if (hp_sdc.dev == NULL) {
- printk("No compatible SDC found.\n");
+ printk(KERN_WARNING PREFIX "No SDC found.\n");
return hp_sdc.dev_err;
}
- printk("HP SDC support loaded.\n");
init_MUTEX_LOCKED(&tq_init_sem);
@@ -938,14 +932,14 @@ static int __init hp_sdc_register(void)
up(&tq_init_sem);
if ((tq_init_seq[0] & HP_SDC_ACT_DEAD) == HP_SDC_ACT_DEAD) {
- printk("Error reading config byte.\n");
+ printk(KERN_WARNING PREFIX "Error reading config byte.\n");
hp_sdc_exit();
return -ENODEV;
}
hp_sdc.r11 = tq_init_seq[4];
if (hp_sdc.r11 & HP_SDC_CFG_NEW) {
char *str;
- printk("New style SDC\n");
+ printk(KERN_INFO PREFIX "New style SDC\n");
tq_init_seq[1] = HP_SDC_CMD_READ_XTD;
tq_init.actidx = 0;
tq_init.idx = 1;
@@ -954,19 +948,19 @@ static int __init hp_sdc_register(void)
down(&tq_init_sem);
up(&tq_init_sem);
if ((tq_init_seq[0] & HP_SDC_ACT_DEAD) == HP_SDC_ACT_DEAD) {
- printk("Error reading extended config byte.\n");
+ printk(KERN_WARNING PREFIX "Error reading extended config byte.\n");
return -ENODEV;
}
hp_sdc.r7e = tq_init_seq[4];
HP_SDC_XTD_REV_STRINGS(hp_sdc.r7e & HP_SDC_XTD_REV, str)
- printk("Revision: %s\n", str);
+ printk(KERN_INFO PREFIX "Revision: %s\n", str);
if (hp_sdc.r7e & HP_SDC_XTD_BEEPER) {
- printk("TI SN76494 beeper present\n");
+ printk(KERN_INFO PREFIX "TI SN76494 beeper present\n");
}
if (hp_sdc.r7e & HP_SDC_XTD_BBRTC) {
- printk("OKI MSM-58321 BBRTC present\n");
+ printk(KERN_INFO PREFIX "OKI MSM-58321 BBRTC present\n");
}
- printk("Spunking the self test register to force PUP "
+ printk(KERN_INFO PREFIX "Spunking the self test register to force PUP "
"on next firmware reset.\n");
tq_init_seq[0] = HP_SDC_ACT_PRECMD |
HP_SDC_ACT_DATAOUT | HP_SDC_ACT_SEMAPHORE;
@@ -982,7 +976,7 @@ static int __init hp_sdc_register(void)
up(&tq_init_sem);
}
else {
- printk("Old style SDC (1820-%s).\n",
+ printk(KERN_INFO PREFIX "Old style SDC (1820-%s).\n",
(hp_sdc.r11 & HP_SDC_CFG_REV) ? "3300" : "2564/3087");
}
Index: drivers/hil/hp_sdc_mlc.c
===================================================================
RCS file: /var/cvs/linux/drivers/hil/hp_sdc_mlc.c,v
retrieving revision 1.2
diff -u -p -r1.2 hp_sdc_mlc.c
--- drivers/hil/hp_sdc_mlc.c 2002/06/27 21:46:55 1.2
+++ drivers/hil/hp_sdc_mlc.c 2002/06/30 14:56:03
@@ -41,6 +41,8 @@
#include <linux/init.h>
#include <linux/string.h>
+#define PREFIX "HP SDC MLC: "
+
static hil_mlc hp_sdc_mlc;
MODULE_AUTHOR("Brian S. Julin <bri@calyx.com>");
@@ -62,7 +64,7 @@ static void hp_sdc_mlc_isr (int irq, voi
write_lock(&(mlc->lock));
if (mlc->icount < 0) {
- printk("HIL Overflow!\n");
+ printk(KERN_WARNING PREFIX "HIL Overflow!\n");
up(&mlc->isem);
goto out;
}
@@ -96,10 +98,10 @@ static void hp_sdc_mlc_isr (int irq, voi
goto out;
err:
- printk("err code %x\n", data);
+ printk(KERN_DEBUG PREFIX "err code %x\n", data);
switch (data) {
case HP_SDC_HIL_RC_DONE:
- printk("Bastard SDC reconfigured loop!\n");
+ printk(KERN_WARNING PREFIX "Bastard SDC reconfigured loop!\n");
break;
case HP_SDC_HIL_ERR:
mlc->ipacket[idx] |= HIL_ERR_INT | HIL_ERR_PERR |
@@ -109,15 +111,15 @@ static void hp_sdc_mlc_isr (int irq, voi
mlc->ipacket[idx] |= HIL_ERR_INT | HIL_ERR_LERR;
break;
case HP_SDC_HIL_RC:
- printk("Bastard SDC decided to reconfigure loop!\n");
+ printk(KERN_WARNING PREFIX "Bastard SDC decided to reconfigure loop!\n");
break;
default:
- printk("Unkown HIL Error status (%x)!\n", data);
+ printk(KERN_WARNING PREFIX "Unkown HIL Error status (%x)!\n", data);
break;
}
/* No more data will be coming due to an error. */
done:
- hil_tasklet_schedule(mlc->tasklet);
+ tasklet_schedule(mlc->tasklet);
up(&(mlc->isem));
out:
write_unlock(&(mlc->lock));
@@ -145,7 +147,7 @@ static int hp_sdc_mlc_in (hil_mlc *mlc,
HIL_PKT_ADDR_MASK |
HIL_PKT_DATA_MASK));
mlc->icount = 14;
- /* printk(">[%x]\n", mlc->ipacket[0]); */
+ /* printk(KERN_DEBUG PREFIX ">[%x]\n", mlc->ipacket[0]); */
goto wasup;
}
do_gettimeofday(&tv);
@@ -317,7 +319,7 @@ static int __init hp_sdc_mlc_init(void)
{
hil_mlc *mlc = &hp_sdc_mlc;
- printk("Registering the System Domain Controller's HIL MLC.\n");
+ printk(KERN_INFO PREFIX "Registering the System Domain Controller's HIL MLC.\n");
hp_sdc_mlc_priv.emtestmode = 0;
hp_sdc_mlc_priv.trans.seq = hp_sdc_mlc_priv.tseq;
@@ -332,19 +334,19 @@ static int __init hp_sdc_mlc_init(void)
mlc->dec_use_count = &hp_sdc_mlc_dec_use_count;
if (hil_mlc_register(mlc)) {
- printk("Failed to register MLC structure with hil_mlc\n");
+ printk(KERN_WARNING PREFIX "Failed to register MLC structure with hil_mlc\n");
goto err0;
}
mlc->priv = &hp_sdc_mlc_priv;
if (hp_sdc_request_hil_irq(&hp_sdc_mlc_isr)) {
- printk("Request for raw HIL ISR hook denied\n");
+ printk(KERN_WARNING PREFIX "Request for raw HIL ISR hook denied\n");
goto err1;
}
return 0;
err1:
if (hil_mlc_unregister(mlc)) {
- printk( "Failed to unregister MLC structure with hil_mlc.\n"
+ printk(KERN_ERR PREFIX "Failed to unregister MLC structure with hil_mlc.\n"
"This is bad. Could cause an oops.\n");
}
err0:
@@ -354,13 +356,12 @@ static int __init hp_sdc_mlc_init(void)
static void __exit hp_sdc_mlc_exit(void)
{
hil_mlc *mlc = &hp_sdc_mlc;
- printk("Unregistering HP-PARISC onboard HIL port.\n");
if (hp_sdc_release_hil_irq(&hp_sdc_mlc_isr)) {
- printk( "Failed to release the raw HIL ISR hook.\n"
+ printk(KERN_ERR PREFIX "Failed to release the raw HIL ISR hook.\n"
"This is bad. Could cause an oops.\n");
}
if (hil_mlc_unregister(mlc)) {
- printk( "Failed to unregister MLC structure with hil_mlc.\n"
+ printk(KERN_ERR PREFIX "Failed to unregister MLC structure with hil_mlc.\n"
"This is bad. Could cause an oops.\n");
}
}
Index: drivers/hil/hp_sdc_rtc.c
===================================================================
RCS file: /var/cvs/linux/drivers/hil/hp_sdc_rtc.c,v
retrieving revision 1.1
diff -u -p -r1.1 hp_sdc_rtc.c
--- drivers/hil/hp_sdc_rtc.c 2002/06/25 19:53:07 1.1
+++ drivers/hil/hp_sdc_rtc.c 2002/06/30 14:56:03
@@ -702,8 +702,8 @@ static int __init hp_sdc_rtc_init(void)
create_proc_read_entry ("driver/rtc", 0, 0,
hp_sdc_rtc_read_proc, NULL);
- printk("HP i8042 SDC + MSM-58321 RTC support loaded (RTC v "
- RTC_VERSION ")\n");
+ printk(KERN_INFO "HP i8042 SDC + MSM-58321 RTC support loaded "
+ "(RTC v " RTC_VERSION ")\n");
return 0;
}
@@ -713,7 +713,7 @@ static void __exit hp_sdc_rtc_exit(void)
remove_proc_entry ("driver/rtc", NULL);
misc_deregister(&hp_sdc_rtc_dev);
hp_sdc_release_timer_irq(hp_sdc_rtc_isr);
- printk("HP i8042 SDC + MSM-58321 RTC support unloaded\n");
+ printk(KERN_INFO "HP i8042 SDC + MSM-58321 RTC support unloaded\n");
}
module_init(hp_sdc_rtc_init);
Index: include/linux/hil.h
===================================================================
RCS file: /var/cvs/linux/include/linux/hil.h,v
retrieving revision 1.2
diff -u -p -r1.2 hil.h
--- include/linux/hil.h 2002/06/25 20:26:16 1.2
+++ include/linux/hil.h 2002/06/30 14:56:04
@@ -36,15 +36,6 @@
#include <asm/types.h>
-#if 0
- #define hil_tasklet_schedule(x) \
- if (smp_processor_id() == 0 && !atomic_read(&((x)->count))) \
- tasklet_schedule(x)
-#else
- #define hil_tasklet_schedule(x) \
- tasklet_schedule(x)
-#endif
-
/* Physical constants relevant to raw loop/device timing.
*/
Index: arch/parisc/debian-configs/32
===================================================================
RCS file: /var/cvs/linux/arch/parisc/debian-configs/32,v
retrieving revision 1.20
diff -u -p -r1.20 32
--- arch/parisc/debian-configs/32 2002/06/27 18:20:19 1.20
+++ arch/parisc/debian-configs/32 2002/06/30 14:56:04
@@ -496,13 +496,13 @@ CONFIG_PPPOE=m
#
# Input core support
#
-CONFIG_INPUT=m
-CONFIG_INPUT_KEYBDEV=m
-CONFIG_INPUT_MOUSEDEV=m
+CONFIG_INPUT=y
+CONFIG_INPUT_KEYBDEV=y
+CONFIG_INPUT_MOUSEDEV=y
CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
# CONFIG_INPUT_JOYDEV is not set
-CONFIG_INPUT_EVDEV=m
+CONFIG_INPUT_EVDEV=y
#
# Character devices
@@ -544,7 +544,7 @@ CONFIG_PSMOUSE=y
# CONFIG_INPUT_PCIGAME is not set
# CONFIG_INPUT_CS461X is not set
# CONFIG_INPUT_EMU10K1 is not set
-CONFIG_INPUT_SERIO=m
+CONFIG_INPUT_SERIO=y
# CONFIG_INPUT_SERPORT is not set
#
@@ -599,19 +599,21 @@ CONFIG_GENRTC=y
# HIL support
#
CONFIG_HIL=y
-CONFIG_HIL_KBD_BASIC=y
+# CONFIG_HIL_KBD_BASIC is not set
#
# HIL driver core support
#
-# CONFIG_HP_SDC is not set
+CONFIG_HP_SDC=y
# CONFIG_HP_SDC_RTC is not set
-# CONFIG_HIL_MLC is not set
-# CONFIG_HP_SDC_MLC is not set
+CONFIG_HIL_MLC=y
+CONFIG_HP_SDC_MLC=y
#
# HIL device driver
#
+CONFIG_HIL_KBD=y
+CONFIG_HIL_PTR=y
#
# Multimedia devices
Index: arch/parisc/debian-configs/32-smp
===================================================================
RCS file: /var/cvs/linux/arch/parisc/debian-configs/32-smp,v
retrieving revision 1.9
diff -u -p -r1.9 32-smp
--- arch/parisc/debian-configs/32-smp 2002/06/27 18:20:19 1.9
+++ arch/parisc/debian-configs/32-smp 2002/06/30 14:56:04
@@ -496,13 +496,13 @@ CONFIG_PPPOE=m
#
# Input core support
#
-CONFIG_INPUT=m
-CONFIG_INPUT_KEYBDEV=m
-CONFIG_INPUT_MOUSEDEV=m
+CONFIG_INPUT=y
+CONFIG_INPUT_KEYBDEV=y
+CONFIG_INPUT_MOUSEDEV=y
CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
# CONFIG_INPUT_JOYDEV is not set
-CONFIG_INPUT_EVDEV=m
+CONFIG_INPUT_EVDEV=y
#
# Character devices
@@ -544,7 +544,7 @@ CONFIG_PSMOUSE=y
# CONFIG_INPUT_PCIGAME is not set
# CONFIG_INPUT_CS461X is not set
# CONFIG_INPUT_EMU10K1 is not set
-CONFIG_INPUT_SERIO=m
+CONFIG_INPUT_SERIO=y
# CONFIG_INPUT_SERPORT is not set
#
@@ -599,19 +599,21 @@ CONFIG_GENRTC=y
# HIL support
#
CONFIG_HIL=y
-CONFIG_HIL_KBD_BASIC=y
+# CONFIG_HIL_KBD_BASIC is not set
#
# HIL driver core support
#
-# CONFIG_HP_SDC is not set
+CONFIG_HP_SDC=y
# CONFIG_HP_SDC_RTC is not set
-# CONFIG_HIL_MLC is not set
-# CONFIG_HP_SDC_MLC is not set
+CONFIG_HIL_MLC=y
+CONFIG_HP_SDC_MLC=y
#
# HIL device driver
#
+CONFIG_HIL_KBD=y
+CONFIG_HIL_PTR=y
#
# Multimedia devices
Index: arch/parisc/debian-configs/64
===================================================================
RCS file: /var/cvs/linux/arch/parisc/debian-configs/64,v
retrieving revision 1.16
diff -u -p -r1.16 64
--- arch/parisc/debian-configs/64 2002/06/27 18:20:19 1.16
+++ arch/parisc/debian-configs/64 2002/06/30 14:56:04
@@ -122,10 +122,10 @@ CONFIG_IP_PNP_BOOTP=y
# CONFIG_IP_PNP_RARP is not set
# CONFIG_NET_IPIP is not set
# CONFIG_NET_IPGRE is not set
+# CONFIG_IP_MROUTE is not set
# CONFIG_ARPD is not set
# CONFIG_INET_ECN is not set
# CONFIG_SYN_COOKIES is not set
-# CONFIG_IP_MROUTE is not set
#
# IP: Netfilter Configuration
@@ -140,10 +140,10 @@ CONFIG_IP_NF_MATCH_MAC=m
CONFIG_IP_NF_MATCH_MARK=m
CONFIG_IP_NF_MATCH_MULTIPORT=m
CONFIG_IP_NF_MATCH_TOS=m
+CONFIG_IP_NF_MATCH_AH_ESP=m
# CONFIG_IP_NF_MATCH_LENGTH is not set
# CONFIG_IP_NF_MATCH_TTL is not set
CONFIG_IP_NF_MATCH_TCPMSS=m
-CONFIG_IP_NF_MATCH_AH_ESP=m
CONFIG_IP_NF_MATCH_STATE=m
CONFIG_IP_NF_MATCH_UNCLEAN=m
CONFIG_IP_NF_MATCH_OWNER=m
@@ -160,10 +160,10 @@ CONFIG_IP_NF_MANGLE=m
CONFIG_IP_NF_TARGET_TOS=m
CONFIG_IP_NF_TARGET_MARK=m
CONFIG_IP_NF_TARGET_LOG=m
+CONFIG_IP_NF_TARGET_ULOG=m
CONFIG_IP_NF_TARGET_TCPMSS=m
CONFIG_IP_NF_COMPAT_IPCHAINS=m
CONFIG_IP_NF_NAT_NEEDED=y
-CONFIG_IP_NF_TARGET_ULOG=m
CONFIG_IP_NF_COMPAT_IPFWADM=m
CONFIG_IP_NF_NAT_NEEDED=y
# CONFIG_IPV6 is not set
@@ -421,7 +421,6 @@ CONFIG_NI52=m
CONFIG_NET_ISA=y
# CONFIG_E2100 is not set
# CONFIG_EWRK3 is not set
-# CONFIG_NATSEMI_CABLE_MAGIC is not set
# CONFIG_EEXPRESS is not set
# CONFIG_EEXPRESS_PRO is not set
# CONFIG_HPLAN_PLUS is not set
@@ -430,7 +429,6 @@ CONFIG_NET_ISA=y
# CONFIG_ETH16I is not set
# CONFIG_NE2000 is not set
CONFIG_NET_PCI=y
-# CONFIG_8139_NEW_RX_RESET is not set
CONFIG_PCNET32=m
CONFIG_ADAPTEC_STARFIRE=m
# CONFIG_AC3200 is not set
@@ -446,6 +444,7 @@ CONFIG_EEPRO100=m
# CONFIG_LNE390 is not set
# CONFIG_FEALNX is not set
CONFIG_NATSEMI=m
+# CONFIG_NATSEMI_CABLE_MAGIC is not set
# CONFIG_NE2K_PCI is not set
# CONFIG_NE3210 is not set
# CONFIG_ES3210 is not set
@@ -454,6 +453,7 @@ CONFIG_8139TOO=m
# CONFIG_8139TOO_PIO is not set
# CONFIG_8139TOO_TUNE_TWISTER is not set
# CONFIG_8139TOO_8129 is not set
+# CONFIG_8139_NEW_RX_RESET is not set
CONFIG_SIS900=m
CONFIG_EPIC100=m
CONFIG_SUNDANCE=m
@@ -513,13 +513,13 @@ CONFIG_PPPOE=m
#
# Input core support
#
-CONFIG_INPUT=m
-CONFIG_INPUT_KEYBDEV=m
-CONFIG_INPUT_MOUSEDEV=m
+CONFIG_INPUT=y
+CONFIG_INPUT_KEYBDEV=y
+CONFIG_INPUT_MOUSEDEV=y
CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
# CONFIG_INPUT_JOYDEV is not set
-CONFIG_INPUT_EVDEV=m
+CONFIG_INPUT_EVDEV=y
#
# Character devices
@@ -558,7 +558,7 @@ CONFIG_PRINTER=y
# CONFIG_INPUT_PCIGAME is not set
# CONFIG_INPUT_CS461X is not set
# CONFIG_INPUT_EMU10K1 is not set
-CONFIG_INPUT_SERIO=m
+CONFIG_INPUT_SERIO=y
# CONFIG_INPUT_SERPORT is not set
#
@@ -618,14 +618,16 @@ CONFIG_HIL_KBD_BASIC=y
#
# HIL driver core support
#
-# CONFIG_HP_SDC is not set
+CONFIG_HP_SDC=y
# CONFIG_HP_SDC_RTC is not set
-# CONFIG_HIL_MLC is not set
-# CONFIG_HP_SDC_MLC is not set
+CONFIG_HIL_MLC=y
+CONFIG_HP_SDC_MLC=y
#
# HIL device driver
#
+CONFIG_HIL_KBD=y
+CONFIG_HIL_PTR=y
#
# Multimedia devices
@@ -721,7 +723,6 @@ CONFIG_NLS=y
#
CONFIG_NLS_DEFAULT="iso8859-1"
# CONFIG_NLS_CODEPAGE_437 is not set
-# CONFIG_NLS_CODEPAGE_1250 is not set
# CONFIG_NLS_CODEPAGE_737 is not set
# CONFIG_NLS_CODEPAGE_775 is not set
# CONFIG_NLS_CODEPAGE_850 is not set
@@ -742,6 +743,7 @@ CONFIG_NLS_DEFAULT="iso8859-1"
# CONFIG_NLS_CODEPAGE_949 is not set
# CONFIG_NLS_CODEPAGE_874 is not set
# CONFIG_NLS_ISO8859_8 is not set
+# CONFIG_NLS_CODEPAGE_1250 is not set
# CONFIG_NLS_CODEPAGE_1251 is not set
# CONFIG_NLS_ISO8859_1 is not set
# CONFIG_NLS_ISO8859_2 is not set
@@ -759,7 +761,6 @@ CONFIG_NLS_DEFAULT="iso8859-1"
# CONFIG_NLS_UTF8 is not set
#
-# CONFIG_FB_TRIDENT is not set
# Console drivers
#
@@ -863,6 +864,7 @@ CONFIG_USB_HID=m
# CONFIG_USB_SERIAL_EMPEG is not set
# CONFIG_USB_SERIAL_FTDI_SIO is not set
# CONFIG_USB_SERIAL_VISOR is not set
+# CONFIG_USB_SERIAL_IPAQ is not set
# CONFIG_USB_SERIAL_IR is not set
# CONFIG_USB_SERIAL_EDGEPORT is not set
# CONFIG_USB_SERIAL_KEYSPAN_PDA is not set
@@ -876,6 +878,7 @@ CONFIG_USB_HID=m
# CONFIG_USB_SERIAL_KEYSPAN_USA19W is not set
# CONFIG_USB_SERIAL_KEYSPAN_USA49W is not set
# CONFIG_USB_SERIAL_MCT_U232 is not set
+# CONFIG_USB_SERIAL_KLSI is not set
# CONFIG_USB_SERIAL_PL2303 is not set
# CONFIG_USB_SERIAL_CYBERJACK is not set
# CONFIG_USB_SERIAL_XIRCOM is not set
@@ -890,5 +893,3 @@ CONFIG_USB_HID=m
# Kernel hacking
#
CONFIG_MAGIC_SYSRQ=y
-# CONFIG_USB_SERIAL_IPAQ is not set
-# CONFIG_USB_SERIAL_KLSI is not set
Index: arch/parisc/debian-configs/64-smp
===================================================================
RCS file: /var/cvs/linux/arch/parisc/debian-configs/64-smp,v
retrieving revision 1.9
diff -u -p -r1.9 64-smp
--- arch/parisc/debian-configs/64-smp 2002/06/27 18:20:19 1.9
+++ arch/parisc/debian-configs/64-smp 2002/06/30 14:56:04
@@ -122,10 +122,10 @@ CONFIG_IP_PNP_BOOTP=y
# CONFIG_IP_PNP_RARP is not set
# CONFIG_NET_IPIP is not set
# CONFIG_NET_IPGRE is not set
+# CONFIG_IP_MROUTE is not set
# CONFIG_ARPD is not set
# CONFIG_INET_ECN is not set
# CONFIG_SYN_COOKIES is not set
-# CONFIG_IP_MROUTE is not set
#
# IP: Netfilter Configuration
@@ -140,10 +140,10 @@ CONFIG_IP_NF_MATCH_MAC=m
CONFIG_IP_NF_MATCH_MARK=m
CONFIG_IP_NF_MATCH_MULTIPORT=m
CONFIG_IP_NF_MATCH_TOS=m
+CONFIG_IP_NF_MATCH_AH_ESP=m
# CONFIG_IP_NF_MATCH_LENGTH is not set
# CONFIG_IP_NF_MATCH_TTL is not set
CONFIG_IP_NF_MATCH_TCPMSS=m
-CONFIG_IP_NF_MATCH_AH_ESP=m
CONFIG_IP_NF_MATCH_STATE=m
CONFIG_IP_NF_MATCH_UNCLEAN=m
CONFIG_IP_NF_MATCH_OWNER=m
@@ -160,10 +160,10 @@ CONFIG_IP_NF_MANGLE=m
CONFIG_IP_NF_TARGET_TOS=m
CONFIG_IP_NF_TARGET_MARK=m
CONFIG_IP_NF_TARGET_LOG=m
+CONFIG_IP_NF_TARGET_ULOG=m
CONFIG_IP_NF_TARGET_TCPMSS=m
CONFIG_IP_NF_COMPAT_IPCHAINS=m
CONFIG_IP_NF_NAT_NEEDED=y
-CONFIG_IP_NF_TARGET_ULOG=m
CONFIG_IP_NF_COMPAT_IPFWADM=m
CONFIG_IP_NF_NAT_NEEDED=y
# CONFIG_IPV6 is not set
@@ -421,7 +421,6 @@ CONFIG_NI52=m
CONFIG_NET_ISA=y
# CONFIG_E2100 is not set
# CONFIG_EWRK3 is not set
-# CONFIG_NATSEMI_CABLE_MAGIC is not set
# CONFIG_EEXPRESS is not set
# CONFIG_EEXPRESS_PRO is not set
# CONFIG_HPLAN_PLUS is not set
@@ -430,7 +429,6 @@ CONFIG_NET_ISA=y
# CONFIG_ETH16I is not set
# CONFIG_NE2000 is not set
CONFIG_NET_PCI=y
-# CONFIG_8139_NEW_RX_RESET is not set
CONFIG_PCNET32=m
CONFIG_ADAPTEC_STARFIRE=m
# CONFIG_AC3200 is not set
@@ -446,6 +444,7 @@ CONFIG_EEPRO100=m
# CONFIG_LNE390 is not set
# CONFIG_FEALNX is not set
CONFIG_NATSEMI=m
+# CONFIG_NATSEMI_CABLE_MAGIC is not set
# CONFIG_NE2K_PCI is not set
# CONFIG_NE3210 is not set
# CONFIG_ES3210 is not set
@@ -454,6 +453,7 @@ CONFIG_8139TOO=m
# CONFIG_8139TOO_PIO is not set
# CONFIG_8139TOO_TUNE_TWISTER is not set
# CONFIG_8139TOO_8129 is not set
+# CONFIG_8139_NEW_RX_RESET is not set
CONFIG_SIS900=m
CONFIG_EPIC100=m
CONFIG_SUNDANCE=m
@@ -513,13 +513,13 @@ CONFIG_PPPOE=m
#
# Input core support
#
-CONFIG_INPUT=m
-CONFIG_INPUT_KEYBDEV=m
-CONFIG_INPUT_MOUSEDEV=m
+CONFIG_INPUT=y
+CONFIG_INPUT_KEYBDEV=y
+CONFIG_INPUT_MOUSEDEV=y
CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
# CONFIG_INPUT_JOYDEV is not set
-CONFIG_INPUT_EVDEV=m
+CONFIG_INPUT_EVDEV=y
#
# Character devices
@@ -558,7 +558,7 @@ CONFIG_PRINTER=y
# CONFIG_INPUT_PCIGAME is not set
# CONFIG_INPUT_CS461X is not set
# CONFIG_INPUT_EMU10K1 is not set
-CONFIG_INPUT_SERIO=m
+CONFIG_INPUT_SERIO=y
# CONFIG_INPUT_SERPORT is not set
#
@@ -618,14 +618,16 @@ CONFIG_HIL_KBD_BASIC=y
#
# HIL driver core support
#
-# CONFIG_HP_SDC is not set
+CONFIG_HP_SDC=y
# CONFIG_HP_SDC_RTC is not set
-# CONFIG_HIL_MLC is not set
-# CONFIG_HP_SDC_MLC is not set
+CONFIG_HIL_MLC=y
+CONFIG_HP_SDC_MLC=y
#
# HIL device driver
#
+CONFIG_HIL_KBD=y
+CONFIG_HIL_PTR=y
#
# Multimedia devices
@@ -721,7 +723,6 @@ CONFIG_NLS=y
#
CONFIG_NLS_DEFAULT="iso8859-1"
# CONFIG_NLS_CODEPAGE_437 is not set
-# CONFIG_NLS_CODEPAGE_1250 is not set
# CONFIG_NLS_CODEPAGE_737 is not set
# CONFIG_NLS_CODEPAGE_775 is not set
# CONFIG_NLS_CODEPAGE_850 is not set
@@ -742,6 +743,7 @@ CONFIG_NLS_DEFAULT="iso8859-1"
# CONFIG_NLS_CODEPAGE_949 is not set
# CONFIG_NLS_CODEPAGE_874 is not set
# CONFIG_NLS_ISO8859_8 is not set
+# CONFIG_NLS_CODEPAGE_1250 is not set
# CONFIG_NLS_CODEPAGE_1251 is not set
# CONFIG_NLS_ISO8859_1 is not set
# CONFIG_NLS_ISO8859_2 is not set
@@ -759,7 +761,6 @@ CONFIG_NLS_DEFAULT="iso8859-1"
# CONFIG_NLS_UTF8 is not set
#
-# CONFIG_FB_TRIDENT is not set
# Console drivers
#
@@ -863,6 +864,7 @@ CONFIG_USB_HID=m
# CONFIG_USB_SERIAL_EMPEG is not set
# CONFIG_USB_SERIAL_FTDI_SIO is not set
# CONFIG_USB_SERIAL_VISOR is not set
+# CONFIG_USB_SERIAL_IPAQ is not set
# CONFIG_USB_SERIAL_IR is not set
# CONFIG_USB_SERIAL_EDGEPORT is not set
# CONFIG_USB_SERIAL_KEYSPAN_PDA is not set
@@ -876,6 +878,7 @@ CONFIG_USB_HID=m
# CONFIG_USB_SERIAL_KEYSPAN_USA19W is not set
# CONFIG_USB_SERIAL_KEYSPAN_USA49W is not set
# CONFIG_USB_SERIAL_MCT_U232 is not set
+# CONFIG_USB_SERIAL_KLSI is not set
# CONFIG_USB_SERIAL_PL2303 is not set
# CONFIG_USB_SERIAL_CYBERJACK is not set
# CONFIG_USB_SERIAL_XIRCOM is not set
@@ -890,5 +893,3 @@ CONFIG_USB_HID=m
# Kernel hacking
#
CONFIG_MAGIC_SYSRQ=y
-# CONFIG_USB_SERIAL_IPAQ is not set
-# CONFIG_USB_SERIAL_KLSI is not set
--Boundary-00=_f1xH99uiYgxYw5V--