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-06-03 22:45:00
|
Update of /cvsroot/linuxconsole/ruby/linux/drivers/char In directory usw-pr-cvs1:/tmp/cvs-serv23928/linux/drivers/char Modified Files: Makefile Log Message: Synced to 2.5.19 Index: Makefile =================================================================== RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/char/Makefile,v retrieving revision 1.40 retrieving revision 1.41 diff -u -d -r1.40 -r1.41 --- Makefile 25 May 2002 20:32:01 -0000 1.40 +++ Makefile 3 Jun 2002 22:44:57 -0000 1.41 @@ -7,8 +7,6 @@ # FONTMAPFILE = cp437.uni -O_TARGET := char.o - obj-y += mem.o tty_io.o n_tty.o tty_ioctl.o raw.o pty.o misc.o random.o # All of the (potential) objects that export symbols. |
|
From: James S. <jsi...@us...> - 2002-06-03 22:44:59
|
Update of /cvsroot/linuxconsole/ruby/linux/arch/ppc/platforms
In directory usw-pr-cvs1:/tmp/cvs-serv23928/linux/arch/ppc/platforms
Modified Files:
pplus_setup.c prep_setup.c sandpoint_setup.c
Log Message:
Synced to 2.5.19
Index: pplus_setup.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/arch/ppc/platforms/pplus_setup.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- pplus_setup.c 1 May 2002 18:07:50 -0000 1.2
+++ pplus_setup.c 3 Jun 2002 22:44:57 -0000 1.3
@@ -70,7 +70,6 @@
#include <asm/todc.h>
#include <asm/bootinfo.h>
-#undef CONFIG_SERIAL_TEXT_DEBUG
#undef DUMP_DBATS
TODC_ALLOC();
@@ -482,9 +481,7 @@
#ifdef CONFIG_SERIAL_TEXT_DEBUG
ppc_md.progress = pplus_progress;
-#else /* !CONFIG_SERIAL_TEXT_DEBUG */
- ppc_md.progress = NULL;
-#endif /* CONFIG_SERIAL_TEXT_DEBUG */
+#endif
#if defined(CONFIG_BLK_DEV_IDE) || defined(CONFIG_BLK_DEV_IDE_MODULE)
ppc_ide_md.default_irq = pplus_ide_default_irq;
Index: prep_setup.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/arch/ppc/platforms/prep_setup.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- prep_setup.c 16 May 2002 18:01:37 -0000 1.3
+++ prep_setup.c 3 Jun 2002 22:44:57 -0000 1.4
@@ -106,9 +106,6 @@
{
extern char *Motherboard_map_name;
int cachew;
-#ifdef CONFIG_PREP_RESIDUAL
- int i;
-#endif
seq_printf(m, "machine\t\t: PReP %s\n", Motherboard_map_name);
@@ -169,6 +166,8 @@
no_l2:
#ifdef CONFIG_PREP_RESIDUAL
if (res->ResidualLength != 0) {
+ int i;
+
/* print info about SIMMs */
seq_printf(m, "simms\t\t: ");
for (i = 0; (res->ActualNumMemories) && (i < MAX_MEMS); i++) {
@@ -801,8 +800,8 @@
io_block_mapping(0xf0000000, PREP_ISA_MEM_BASE, 0x08000000, _PAGE_IO);
}
-static void __init
-prep_init2(void)
+static int __init
+prep_request_io(void)
{
#ifdef CONFIG_NVRAM
request_region(PREP_NVRAM_AS0, 0x8, "nvram");
@@ -811,8 +810,12 @@
request_region(0x40,0x20,"timer");
request_region(0x80,0x10,"dma page reg");
request_region(0xc0,0x20,"dma2");
+
+ return 0;
}
+device_initcall(prep_request_io);
+
void __init
prep_init(unsigned long r3, unsigned long r4, unsigned long r5,
unsigned long r6, unsigned long r7)
@@ -852,7 +855,6 @@
ppc_md.init_IRQ = prep_init_IRQ;
/* this gets changed later on if we have an OpenPIC -- Cort */
ppc_md.get_irq = i8259_irq;
- ppc_md.init = prep_init2;
ppc_md.restart = prep_restart;
ppc_md.power_off = prep_power_off;
Index: sandpoint_setup.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/arch/ppc/platforms/sandpoint_setup.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- sandpoint_setup.c 1 May 2002 18:07:50 -0000 1.2
+++ sandpoint_setup.c 3 Jun 2002 22:44:57 -0000 1.3
@@ -6,7 +6,7 @@
* Author: Mark A. Greer
* mg...@mv...
*
- * Copyright 2000, 2001 MontaVista Software Inc.
+ * Copyright 2000-2002 MontaVista Software Inc.
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -71,7 +71,6 @@
#include <linux/delay.h>
#include <linux/irq.h>
#include <linux/ide.h>
-#include <linux/irq.h>
#include <linux/seq_file.h>
#include <asm/system.h>
@@ -169,7 +168,7 @@
#endif
printk("Motorola SPS Sandpoint Test Platform\n");
- printk("Sandpoint port (C) 2000, 2001 MontaVista Software, Inc. (so...@mv...)\n");
+ printk("Sandpoint port (MontaVista Software, Inc. (so...@mv...))\n");
/* The Sandpoint rom doesn't enable any caches. Do that now.
* The 7450 portion will also set up the L3s once I get enough
|
|
From: James S. <jsi...@us...> - 2002-06-03 22:44:59
|
Update of /cvsroot/linuxconsole/ruby/linux/arch/ppc
In directory usw-pr-cvs1:/tmp/cvs-serv23928/linux/arch/ppc
Modified Files:
Config.help config.in
Log Message:
Synced to 2.5.19
Index: Config.help
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/arch/ppc/Config.help,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Config.help 16 May 2002 18:01:37 -0000 1.5
+++ Config.help 3 Jun 2002 22:44:56 -0000 1.6
@@ -299,8 +299,15 @@
other useful pieces of information. Sometimes this information is
not present or incorrect.
- Unless you expect to boot on a PReP system, there is not need to
+ Unless you expect to boot on a PReP system, there is no need to
select Y.
+
+PReP residual data available in /proc/residual
+CONFIG_PROC_PREPRESIDUAL
+ Enabling this option will create a /proc/residual file which allows
+ you to get at the residual data on PReP systems. You will need a tool
+ (lsresidual) to parse it. If you aren't on a PReP system, you don't
+ want this.
CONFIG_ADB
Apple Desktop Bus (ADB) support is for support of devices which
Index: config.in
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/arch/ppc/config.in,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- config.in 16 May 2002 18:01:37 -0000 1.32
+++ config.in 3 Jun 2002 22:44:56 -0000 1.33
@@ -18,11 +18,15 @@
define_bool CONFIG_PPC32 y
choice 'Processor Type' \
"6xx/7xx/74xx/8260 CONFIG_6xx \
- 4xx CONFIG_4xx \
+ 40x CONFIG_40x \
POWER3 CONFIG_POWER3 \
8xx CONFIG_8xx \
iSeries CONFIG_PPC_ISERIES" 6xx
+if [ "$CONFIG_40x" = "y" ]; then
+ define_bool CONFIG_4xx y
+fi
+
if [ "$CONFIG_6xx" = "y" ]; then
bool 'MPC8260 CPM Support' CONFIG_8260
fi
@@ -52,17 +56,21 @@
Willow CONFIG_WILLOW" Willow
fi
-if [ "$CONFIG_4xx" = "y" ]; then
+if [ "$CONFIG_40x" = "y" ]; then
choice 'Machine Type' \
"Ash CONFIG_ASH \
Ceder CONFIG_CEDER \
CPCI405 CONFIG_CPCI405 \
- EP405 CONFIG_EP405 \
+ EP405/EP405PC CONFIG_EP405 \
Oak CONFIG_OAK \
Redwood-4 CONFIG_REDWOOD_4 \
Redwood-5 CONFIG_REDWOOD_5 \
Tivo CONFIG_TIVO \
Walnut CONFIG_WALNUT" Walnut
+
+ if [ "$CONFIG_EP405" = "y" ]; then
+ bool 'EP405PC Support' CONFIG_EP405PC
+ fi
fi
if [ "$CONFIG_8xx" = "y" ]; then
@@ -182,7 +190,7 @@
bool 'Math emulation' CONFIG_MATH_EMULATION
fi
-if [ "$CONFIG_4xx" = "y" ]; then
+if [ "$CONFIG_40x" = "y" ]; then
# It's often necessary to know the specific 4xx processor type.
# Fortunately, it is impled (so far) from the board type, so we
# don't need to ask more redundant questions.
@@ -238,11 +246,9 @@
bool 'Blue Logic DMA' CONFIG_405_DMA
dep_bool 'Power Management support (experimental)' CONFIG_PM $CONFIG_EXPERIMENTAL
- if [ "$CONFIG_4xx" = "y" ]; then
- choice 'TTYS0 device and default console' \
+ choice 'TTYS0 device and default console' \
"UART0 CONFIG_UART0_TTYS0 \
UART1 CONFIG_UART0_TTYS1" UART0
- fi
define_bool CONFIG_IBM405_ERR51 y
define_bool CONFIG_NOT_COHERENT_CACHE y
@@ -282,7 +288,7 @@
if [ "$CONFIG_8xx" = "y" ]; then
bool "Pinned Kernel TLBs (860 ONLY)" CONFIG_PIN_TLB
fi
- if [ "$CONFIG_4xx" = "y" ]; then
+ if [ "$CONFIG_40x" = "y" ]; then
bool "Pinned Kernel TLBs" CONFIG_PIN_TLB
fi
if [ "$CONFIG_ALL_PPC" != "y" ]; then
@@ -362,6 +368,7 @@
bool 'Support for Open Firmware device tree in /proc' CONFIG_PROC_DEVICETREE
bool 'Support for RTAS (RunTime Abstraction Services) in /proc' CONFIG_PPC_RTAS
bool 'Support for PReP Residual Data' CONFIG_PREP_RESIDUAL
+ dep_bool ' Support for reading of PReP Residual Data in /proc' CONFIG_PROC_PREPRESIDUAL $CONFIG_PREP_RESIDUAL
fi
bool 'Default bootloader kernel arguments' CONFIG_CMDLINE_BOOL
@@ -564,15 +571,15 @@
source arch/ppc/8260_io/Config.in
fi
-if [ "$CONFIG_4xx" = "y"]; then
+if [ "$CONFIG_40x" = "y" ]; then
mainmenu_option next_comment
- comment 'IBM 4xx options'
+ comment 'IBM 40x options'
if [ "$CONFIG_STB03xxx" = "y" ]; then
bool 'STB IR Keyboard' CONFIG_STB_KB
bool 'SICC Serial port' CONFIG_SERIAL_SICC
if [ "$CONFIG_SERIAL_SICC" = "y" -a "$CONFIG_UART0_TTYS1" = "y" ]; then
- define_bool CONFIG_UART1_DFLT_CONSOLE y
- define_bool CONFIG_SERIAL_SICC_CONSOLE y
+ define_bool CONFIG_UART1_DFLT_CONSOLE y
+ define_bool CONFIG_SERIAL_SICC_CONSOLE y
fi
fi
endmenu
@@ -611,8 +618,8 @@
fi
if [ "$CONFIG_4xx" = "y" -o "$CONFIG_GT64260" = "y" \
-o "$CONFIG_LOPEC" = "y" -o "$CONFIG_MCPN765" = "y" \
- -o "$CONFIG_PRPMC800" = "y" -o "$CONFIG_SANDPOINT" = "y" \
- -o "$CONFIG_ZX4500" = "y" ]; then
+ -o "$CONFIG_PPLUS" = "y" -o "$CONFIG_PRPMC800" = "y" \
+ -o "$CONFIG_SANDPOINT" = "y" -o "$CONFIG_ZX4500" = "y" ]; then
bool 'Support for early boot texts over serial port' CONFIG_SERIAL_TEXT_DEBUG
fi
endmenu
|
|
From: James S. <jsi...@us...> - 2002-06-03 22:44:58
|
Update of /cvsroot/linuxconsole/ruby In directory usw-pr-cvs1:/tmp/cvs-serv23928 Added Files: AGAINST-2.5.19 Log Message: Synced to 2.5.19 --- NEW FILE: AGAINST-2.5.19 --- |
|
From: johann d. <jd...@us...> - 2002-06-02 17:34:25
|
Update of /cvsroot/linuxconsole/ruby/linux/drivers/usb/input
In directory usw-pr-cvs1:/tmp/cvs-serv3731/drivers/usb/input
Modified Files:
hid-lg3dff.c
Log Message:
Fixed timer deletion.
Comments updated.
Index: hid-lg3dff.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/usb/input/hid-lg3dff.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- hid-lg3dff.c 26 Apr 2002 16:26:00 -0000 1.2
+++ hid-lg3dff.c 2 Jun 2002 17:34:22 -0000 1.3
@@ -37,10 +37,10 @@
#define RUN_AT(t) (jiffies + (t))
-/* Frequency at which the rendering is updated */
-#define FREQ (HZ/20)
+/* Periodicity of the update */
+#define PERIOD (HZ/10)
-/* Effect status */
+/* Effect status: lg3d_effect::flags */
#define EFFECT_STARTED 0 /* Effect is going to play after some time
(ff_replay.delay) */
#define EFFECT_PLAYING 1 /* Effect is being played */
@@ -66,6 +66,10 @@
unsigned long started_at; /* When the effect started to play */
};
+// For lg3d_device::flags
+#define DEVICE_USB_XMIT 0 /* An URB is being sent */
+#define DEVICE_CLOSING 1 /* The driver is being unitialised */
+
struct lg3d_device {
struct hid_device* hid;
@@ -80,6 +84,9 @@
struct timer_list timer;
unsigned long last_time; /* Last time the timer handler was
executed */
+
+ unsigned long flags[1]; /* Contains various information about the
+ state of the driver for this device */
};
static void hid_lg3d_ctrl_out(struct urb *urb);
@@ -138,6 +145,7 @@
printk(KERN_INFO "Force feedback for Logitech *3D devices by Johann Deneux <de...@if...>\n");
/* Start the update task */
+ private->timer.expires = RUN_AT(PERIOD);
add_timer(&private->timer); /*TODO: only run the timer when at least
one effect is playing */
@@ -147,6 +155,11 @@
static void hid_lg3d_exit(struct hid_device* hid)
{
struct lg3d_device *lg3d = hid->ff_private;
+ unsigned long flags;
+
+ spin_lock_irqsave(&lg3d->lock, flags);
+ set_bit(DEVICE_CLOSING, lg3d->flags);
+ spin_unlock_irqrestore(&lg3d->lock, flags);
del_timer_sync(&lg3d->timer);
@@ -154,6 +167,8 @@
usb_unlink_urb(lg3d->urbffout);
usb_free_urb(lg3d->urbffout);
}
+
+ kfree(lg3d);
}
static int hid_lg3d_event(struct hid_device *hid, struct input_dev* input,
@@ -247,7 +262,7 @@
int id;
unsigned long flags;
- dbg("ioctl rumble");
+ dbg("ioctl upload");
if (!test_bit(effect->type, input->ffbit)) return -EINVAL;
@@ -280,8 +295,6 @@
new.effect = *effect;
new.effect.replay = effect->replay;
- /* If we updated an effect that was being played, we need to remake
- the rumble effect */
if (test_bit(EFFECT_STARTED, lg3d->effects[id].flags)
|| test_bit(EFFECT_STARTED, lg3d->effects[id].flags)) {
@@ -306,10 +319,17 @@
static void hid_lg3d_ctrl_out(struct urb *urb)
{
struct hid_device *hid = urb->context;
+ struct lg3d_device *lg3d = hid->ff_private;
+ unsigned long flags;
+
+ spin_lock_irqsave(&lg3d->lock, flags);
if (urb->status)
warn("hid_irq_ffout status %d received", urb->status);
+ clear_bit(DEVICE_USB_XMIT, lg3d->flags);
+ dbg("xmit = 0");
+ spin_unlock_irqrestore(&lg3d->lock, flags);
}
static void hid_lg3d_timer(unsigned long timer_data)
@@ -325,6 +345,22 @@
y = 0;
spin_lock_irqsave(&lg3d->lock, flags);
+ if (test_bit(DEVICE_USB_XMIT, lg3d->flags)) {
+ if (lg3d->urbffout->status != -EINPROGRESS) {
+ warn("xmit *not* in progress");
+ }
+ else {
+ dbg("xmit in progress");
+ }
+
+ spin_unlock_irqrestore(&lg3d->lock, flags);
+
+ lg3d->timer.expires = RUN_AT(PERIOD);
+ add_timer(&lg3d->timer);
+
+ return;
+ }
+
for (i=0; i<N_EFFECTS; ++i) {
struct lg3d_effect* effect = lg3d->effects +i;
@@ -360,8 +396,6 @@
}
}
- spin_unlock_irqrestore(&lg3d->lock, flags);
-
lg3d->urbffout->pipe = usb_sndctrlpipe(hid->dev, 0);
lg3d->ffcr.bRequestType = USB_TYPE_CLASS | USB_DIR_OUT | USB_RECIP_INTERFACE;
lg3d->urbffout->transfer_buffer_length = lg3d->ffcr.wLength = 8;
@@ -379,6 +413,13 @@
if ((err=usb_submit_urb(lg3d->urbffout, GFP_ATOMIC)))
warn("usb_submit_urb returned %d", err);
+ else
+ set_bit(DEVICE_USB_XMIT, lg3d->flags);
- add_timer(&lg3d->timer);
+ if (!test_bit(DEVICE_CLOSING, lg3d->flags)) {
+ lg3d->timer.expires = RUN_AT(PERIOD);
+ add_timer(&lg3d->timer);
+ }
+
+ spin_unlock_irqrestore(&lg3d->lock, flags);
}
|
|
From: johann d. <jd...@us...> - 2002-06-02 17:19:24
|
Update of /cvsroot/linuxconsole/ruby/linux/drivers/usb/input
In directory usw-pr-cvs1:/tmp/cvs-serv1034/drivers/usb/input
Modified Files:
hid-core.c
Log Message:
Unlink failed URBs in hid_init_reports.
Index: hid-core.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/usb/input/hid-core.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- hid-core.c 28 May 2002 17:16:25 -0000 1.3
+++ hid-core.c 2 Jun 2002 17:19:21 -0000 1.4
@@ -1159,7 +1159,7 @@
add_wait_queue(&hid->wait, &wait);
while (timeout && (test_bit(HID_CTRL_RUNNING, &hid->iofl) ||
- test_bit(HID_OUT_RUNNING, &hid->iofl)))
+ test_bit(HID_OUT_RUNNING, &hid->iofl)))
timeout = schedule_timeout(timeout);
set_current_state(TASK_RUNNING);
@@ -1210,6 +1210,7 @@
struct hid_report *report;
struct list_head *list;
int len;
+ int err, ret;
report_enum = hid->report_enum + HID_INPUT_REPORT;
list = report_enum->report_list.next;
@@ -1227,7 +1228,16 @@
list = list->next;
}
- if (hid_wait_io(hid)) {
+ err = 0;
+ while (ret = hid_wait_io(hid)) {
+ err |= ret;
+ if (test_bit(HID_CTRL_RUNNING, &hid->iofl))
+ usb_unlink_urb(hid->urbctrl);
+ if (test_bit(HID_OUT_RUNNING, &hid->iofl))
+ usb_unlink_urb(hid->urbout);
+ }
+
+ if (err) {
warn("timeout initializing reports\n");
return;
}
@@ -1346,6 +1356,7 @@
goto fail;
pipe = usb_sndbulkpipe(dev, endpoint->bEndpointAddress);
FILL_BULK_URB(hid->urbout, dev, pipe, hid->outbuf, 0, hid_irq_out, hid);
+ hid->urbout->transfer_flags |= USB_ASYNC_UNLINK;
}
}
@@ -1386,6 +1397,7 @@
hid->urbctrl = usb_alloc_urb(0, GFP_KERNEL);
FILL_CONTROL_URB(hid->urbctrl, dev, 0, (void*) &hid->cr, hid->ctrlbuf, 1, hid_ctrl, hid);
+ hid->urbctrl->transfer_flags |= USB_ASYNC_UNLINK;
return hid;
|
|
From: Franz S. <fs...@us...> - 2002-05-31 11:20:41
|
Update of /cvsroot/linuxconsole/ruby/linux/drivers/macintosh
In directory usw-pr-cvs1:/tmp/cvs-serv9963
Modified Files:
adbhid.c
Log Message:
Resync with PPC tree.
Index: adbhid.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/macintosh/adbhid.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- adbhid.c 21 May 2002 19:34:14 -0000 1.4
+++ adbhid.c 31 May 2002 11:20:38 -0000 1.5
@@ -271,15 +271,37 @@
switch (adbhid[id]->original_handler_id) {
default:
case 0x02: /* Adjustable keyboard button device */
- printk(KERN_INFO "Unhandled ADB_MISC event %02x, %02x, %02x, %02x\n",
- data[0], data[1], data[2], data[3]);
- break;
+ {
+ int down = (data[1] == (data[1] & 0xf));
+
+ switch (data[1] & 0x0f) {
+ case 0x0: /* microphone */
+ input_report_key(&adbhid[id]->input, KEY_SOUND, down);
+ break;
+
+ case 0x1: /* mute */
+ input_report_key(&adbhid[id]->input, KEY_MUTE, down);
+ break;
+
+ case 0x2: /* volume decrease */
+ input_report_key(&adbhid[id]->input, KEY_VOLUMEDOWN, down);
+ break;
+
+ case 0x3: /* volume increase */
+ input_report_key(&adbhid[id]->input, KEY_VOLUMEUP, down);
+ break;
+
+ default:
+ printk(KERN_INFO "Unhandled ADB_MISC event %02x, %02x, %02x, %02x\n",
+ data[0], data[1], data[2], data[3]);
+ break;
+ }
+ }
+ break;
+
case 0x1f: /* Powerbook button device */
{
int down = (data[1] == (data[1] & 0xf));
-#ifdef CONFIG_PMAC_BACKLIGHT
- int backlight = get_backlight_level();
-#endif
/*
* XXX: Where is the contrast control for the passive?
* -- Cort
@@ -287,44 +309,28 @@
switch (data[1] & 0x0f) {
case 0x8: /* mute */
- input_report_key(&adbhid[id]->input, KEY_MUTE,
- down);
+ input_report_key(&adbhid[id]->input, KEY_MUTE, down);
break;
case 0x7: /* volume decrease */
- input_report_key(&adbhid[id]->input, KEY_VOLUMEDOWN,
- down);
+ input_report_key(&adbhid[id]->input, KEY_VOLUMEDOWN, down);
break;
case 0x6: /* volume increase */
- input_report_key(&adbhid[id]->input, KEY_VOLUMEUP,
- down);
+ input_report_key(&adbhid[id]->input, KEY_VOLUMEUP, down);
break;
case 0xb: /* eject */
- input_report_key(&adbhid[id]->input, KEY_EJECTCD,
- down);
+ input_report_key(&adbhid[id]->input, KEY_EJECTCD, down);
break;
-#ifdef CONFIG_PMAC_BACKLIGHT
case 0xa: /* brightness decrease */
- if (!down || backlight < 0)
- break;
- if (backlight > BACKLIGHT_OFF)
- set_backlight_level(backlight-1);
- else
- set_backlight_level(BACKLIGHT_OFF);
+ input_report_key(&adbhid[id]->input, KEY_BRIGHTNESSDOWN, down);
break;
case 0x9: /* brightness increase */
- if (!down || backlight < 0)
- break;
- if (backlight < BACKLIGHT_MAX)
- set_backlight_level(backlight+1);
- else
- set_backlight_level(BACKLIGHT_MAX);
+ input_report_key(&adbhid[id]->input, KEY_BRIGHTNESSUP, down);
break;
-#endif /* CONFIG_PMAC_BACKLIGHT */
}
}
break;
@@ -436,7 +442,7 @@
return;
memset(adbhid[id], 0, sizeof(struct adbhid));
- sprintf(adbhid[id]->phys, "adb%d:%d.%02x/input0", id, default_id, original_handler_id);
+ sprintf(adbhid[id]->phys, "adb%d:%d.%02x/input", id, default_id, original_handler_id);
adbhid[id]->id = default_id;
adbhid[id]->original_handler_id = original_handler_id;
@@ -515,6 +521,11 @@
switch (original_handler_id) {
case 0x02: /* Adjustable keyboard button device */
sprintf(adbhid[id]->name, "ADB adjustable keyboard buttons");
+ adbhid[id]->input.evbit[0] = BIT(EV_KEY) | BIT(EV_REP);
+ set_bit(KEY_SOUND, adbhid[id]->input.keybit);
+ set_bit(KEY_MUTE, adbhid[id]->input.keybit);
+ set_bit(KEY_VOLUMEUP, adbhid[id]->input.keybit);
+ set_bit(KEY_VOLUMEDOWN, adbhid[id]->input.keybit);
break;
case 0x1f: /* Powerbook button device */
sprintf(adbhid[id]->name, "ADB Powerbook buttons");
@@ -522,6 +533,8 @@
set_bit(KEY_MUTE, adbhid[id]->input.keybit);
set_bit(KEY_VOLUMEUP, adbhid[id]->input.keybit);
set_bit(KEY_VOLUMEDOWN, adbhid[id]->input.keybit);
+ set_bit(KEY_BRIGHTNESSUP, adbhid[id]->input.keybit);
+ set_bit(KEY_BRIGHTNESSDOWN, adbhid[id]->input.keybit);
set_bit(KEY_EJECTCD, adbhid[id]->input.keybit);
break;
}
@@ -539,8 +552,8 @@
input_register_device(&adbhid[id]->input);
- printk(KERN_INFO "input: %s on adb%d:%d.%02x\n",
- adbhid[id]->name, id, default_id, original_handler_id);
+ printk(KERN_INFO "input: %s on %s\n",
+ adbhid[id]->name, adbhid[id]->phys);
if (default_id == ADB_KEYBOARD) {
/* HACK WARNING!! This should go away as soon there is an utility
|
|
From: Franz S. <fs...@us...> - 2002-05-31 10:35:53
|
Update of /cvsroot/linuxconsole/ruby/linux/include/linux In directory usw-pr-cvs1:/tmp/cvs-serv26871/linux/include/linux Modified Files: input.h Log Message: Remove duplicated defines. Index: input.h =================================================================== RCS file: /cvsroot/linuxconsole/ruby/linux/include/linux/input.h,v retrieving revision 1.67 retrieving revision 1.68 diff -u -d -r1.67 -r1.68 --- input.h 21 May 2002 04:06:06 -0000 1.67 +++ input.h 31 May 2002 10:35:49 -0000 1.68 @@ -329,9 +329,6 @@ #define KEY_UNKNOWN 240 -#define KEY_BRIGHTNESSDOWN 224 -#define KEY_BRIGHTNESSUP 225 - #define BTN_MISC 0x100 #define BTN_0 0x100 #define BTN_1 0x101 |
|
From: James S. <jsi...@us...> - 2002-05-30 04:47:43
|
Update of /cvsroot/linuxconsole/ruby/linux/drivers/video/tdfx
In directory usw-pr-cvs1:/tmp/cvs-serv19283
Modified Files:
3dfxfb.c
Log Message:
Added drawing the penguin support to Voodoo3+ driver.
Index: 3dfxfb.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/video/tdfx/3dfxfb.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- 3dfxfb.c 23 Feb 2002 16:46:54 -0000 1.21
+++ 3dfxfb.c 30 May 2002 04:47:40 -0000 1.22
@@ -1076,7 +1076,7 @@
srcfmt = 0x400000;
} else {
banshee_make_room(6 + ((size + 3) >> 2));
- srcfmt = 0xBEEFDEAD;
+ srcfmt = stride | ((bpp+((bpp==8) ? 0 : 8)) << 13) | 0x400000;
}
tdfx_outl(SRCXY, 0);
|
|
From: Brad M. <bra...@us...> - 2002-05-29 03:15:04
|
Update of /cvsroot/linuxconsole/ruby/docs
In directory usw-pr-cvs1:/tmp/cvs-serv26199/docs
Modified Files:
FB-Driver-HOWTO console.txt
Log Message:
typos, unbalanced <ul>
Index: FB-Driver-HOWTO
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/docs/FB-Driver-HOWTO,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- FB-Driver-HOWTO 24 Apr 2002 04:52:32 -0000 1.2
+++ FB-Driver-HOWTO 29 May 2002 03:15:01 -0000 1.3
@@ -72,7 +72,7 @@
Much of this information came from the new framebuffer internal API being
developed by me for the upcoming next series of kernels. Originally this
was based on a patch by Fabrice Bellard. I learned of this patch and
- was impressed by it. Later I toke over it development and improved even
+ was impressed by it. Later I took over development and improved it even
more. Much thanks goes to Fabrice for getting the ball rolling. This API is
a natural extension of the original API developed by Martin Schaller and
now maintained by Geert Uytterhoeven (ge...@li...). Thanks
@@ -159,7 +159,7 @@
2.1 Monitor
First lets discribe one of the biggest but often overlooked components,
- the monitor. Today there exist many types of monitors. Flat screen to LED
+ the monitor. Today there are many types of monitors. Flat screen to LED
and so on. For all the many types the basic principle behind the monitor is
the same. Basically a monitor builds an image sequentially from the data it
gets on its input lines. To achieve this a beam scans over the screen in a
@@ -525,15 +525,15 @@
3.7 Colors
- There exist an endless number of colors but colors have a special property.
+ There is an endless number of colors but colors have a special property.
If you take two colors and mix them together you get a different color.
- There exist many models to represent colors but fbdev is based on what is
- known as the RGB color model. Out of all the colors there exist three colors
+ There are many models to represent colors but fbdev is based on what is
+ known as the RGB color model. Out of all the colors there are three colors
in this model which when mixed in different amounts can produce any color.
- These colors are known as primary colors. There does exist a physical limit
- to mixing colors. If you take and mix red, green, and blue in equal amounts
+ These colors are known as primary colors. There is a physical limit
+ to mixing colors. If you mix red, green, and blue in equal amounts
you get gray. Now if you make each color component equally brighter the final
- color will become white. Now there reaches a point where making each component
+ color will become white. Now there is a point where making each component
brighter and brighter you will still end up with white. You can increase the
intensity of a color component by any amount from some inital value up to
this physical limit. This is where the image depth comes in. As you know on
@@ -566,7 +566,7 @@
The way fbdev tells what this video memory to pixel mapping is, is with
the type field in fb_fix_screeninfo. Here I'm going to describe the
- FB_TYPE_PACKED_PIXELS layout since it is the most common. Here there exists
+ FB_TYPE_PACKED_PIXELS layout since it is the most common. Here there is
a direct mapping from video memory to pixel value. If you place a 5 in video
memory then the pixel value at that position will be 5. This is important
when you have memory mapped the video memory to userland. Next we consider
@@ -588,7 +588,7 @@
colors needed. If your application needs a specific set of colors it would
switch the color maps and you would get the needed colors. Of course this
also switches the other colors in the applications. That was the trade off.
- This became what was known as pseudocolor mode. In fbdev API there exist two
+ This became what was known as pseudocolor mode. In fbdev API there are two
types of pseudocolor mappings. A static one and a dynamic one.
FB_VISUAL_STATIC_PSEUDOCOLOR defines a video card that has a non programmable
color map. What colors you get are what you are stuck with. The other type
@@ -596,9 +596,9 @@
colors but this required having a larger color map. Also video memory prices
started to drop and video cards begain to sell with more of it. To properly
support 256 color intensity levels for each color component you would need a
- color map of 16 million colors. So new mappings where developed in which
- specific fields of a pixel where directly proportional to the intensity of a
- color component. Two types of mappings were developed. One being truecolor
+ color map of 16 million colors. So new mappings were developed in which
+ specific fields of a pixel were directly proportional to the intensity of a
+ color component. Two types of mappings were developed. One was truecolor
and the other directcolor. In truecolor you cannot change the mappings from
the pixel value to color intensities. Setting a value of 64 to the red
component of the pixel will result in a red intensity of 64. How bright of a
@@ -634,7 +634,7 @@
fb_fix_screeninfo, fb_monospecs, and fb_info. The first three can be made
available to and from userland. First let me describe what each means and
how they are used. Fb_var_screeninfo is used to describe the features of
- a video card you normally can set. Its with fb_var_screeninfo you can define
+ a video card you normally can set. It's with fb_var_screeninfo you can define
such things as depth and the resolution you want. The next structure is
fb_fix_screeninfo. This defines the properties of a card that are created
when you set a mode and can't be changed otherwise. A good example is the
@@ -643,11 +643,11 @@
you. In this case the video hardware tells you the memory location and you
have no say about it. The third structure is fb_monospecs. In the old API
the importance of fb_monospecs was very little. This allowed for forbidden
- things such as setting a mode of 800x600 on a fix frequency monitor. With
+ things such as setting a mode of 800x600 on a fixed-frequency monitor. With
the new API fb_monospecs prevents such things and if used correctly can
prevent a monitor from being cooked. The final data structure is fb_info.
This defines the current state of the video card. Fb_info is only visible
- from the kernel. Inside of fb_info there exists a fb_ops which is a collection
+ from the kernel. Inside of fb_info there is a fb_ops which is a collection
of needed functions to make fbdev and fbcon work.
4.2 Driver layout
@@ -894,7 +894,7 @@
into xxxfb_setcolreg. Now for truecolor and directcolor mode it's a little
different. In this case we simulate a psuedo color map. The reason for this
is the console system always has a color map which has 16 entries. In fb_info
- there exists the pseudo_palette which gives a mapping from a non color map
+ there is the pseudo_palette which gives a mapping from a non color map
mode to a color map based system. The pseudo_palette always has 17 entries.
The first 16 for the console colors and the last one for the cursor. So if
we wanted to display the 4 entry in the color map of the console we would
Index: console.txt
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/docs/console.txt,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- console.txt 22 Apr 2002 10:21:52 -0000 1.3
+++ console.txt 29 May 2002 03:15:01 -0000 1.4
@@ -21,7 +21,7 @@
As linux is ported to more and more different flavors of hardware we
are beginning to see the need to redesign many parts of the kernel. The reason
is that linux was originally done on the 32 bit intel platform. Thus many
-parts of the kernel design was ix86 centeric. Over time this has changed and
+parts of the kernel design were ix86 centeric. Over time this has changed and
still continues to change. The console redesign is another such a change to
support the needs of these many new devices to linux.
|
|
From: Brad M. <bra...@us...> - 2002-05-29 03:15:04
|
Update of /cvsroot/linuxconsole/ruby/linux/Documentation/input In directory usw-pr-cvs1:/tmp/cvs-serv26199/linux/Documentation/input Modified Files: input.txt Log Message: typos, unbalanced <ul> Index: input.txt =================================================================== RCS file: /cvsroot/linuxconsole/ruby/linux/Documentation/input/input.txt,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- input.txt 25 Sep 2001 09:31:32 -0000 1.7 +++ input.txt 29 May 2002 03:15:01 -0000 1.8 @@ -68,7 +68,7 @@ crw-r--r-- 1 root root 13, 63 Mar 28 22:45 mice - This device has to be created, unless you use devfs, in which case its + This device has to be created, unless you use devfs, in which case it's created automatically. The commands to do create it by hand are: cd /dev @@ -197,7 +197,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_[XY] in the kernel configuration are the size of your screen (in pixels) in XFree86. This is needed if you -want to use your digitizer in X, because it's movement is sent to X +want to use your digitizer in X, because its movement is sent to X via a virtual PS/2 mouse and thus needs to be scaled accordingly. These values won't be used if you use a mouse only. @@ -291,7 +291,7 @@ 6. Contacts ~~~~~~~~~~~ - This effort has it's home page at: + This effort has its home page at: http://www.suse.cz/development/input/ |
|
From: Brad M. <bra...@us...> - 2002-05-29 03:15:04
|
Update of /cvsroot/linuxconsole/ruby/web/htdocs In directory usw-pr-cvs1:/tmp/cvs-serv26199/web/htdocs Modified Files: index.html Log Message: typos, unbalanced <ul> Index: index.html =================================================================== RCS file: /cvsroot/linuxconsole/ruby/web/htdocs/index.html,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- index.html 24 May 2002 08:07:24 -0000 1.10 +++ index.html 29 May 2002 03:15:01 -0000 1.11 @@ -27,7 +27,7 @@ Right now the console subsystem and the subsystems that depend on it have a couple of problems as well as some design issues which need -to be addressed for todays needs: +to be addressed for today's needs: <ol> @@ -79,7 +79,7 @@ <H1>Project Status and News:</H1> Development is moving fast. Since we cover a lot of areas of the linux kernel -we have separate links to pages that have developments to each different +we have separate links to pages that have developments in each different sub system<p> <a href="input/input.html">Input API</a> |
|
From: Brad M. <bra...@us...> - 2002-05-29 03:15:04
|
Update of /cvsroot/linuxconsole/ruby/web/htdocs/paper In directory usw-pr-cvs1:/tmp/cvs-serv26199/web/htdocs/paper Modified Files: contents.html index.html intro.html Log Message: typos, unbalanced <ul> Index: contents.html =================================================================== RCS file: /cvsroot/linuxconsole/ruby/web/htdocs/paper/contents.html,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- contents.html 12 Apr 2002 19:11:15 -0000 1.1 +++ contents.html 29 May 2002 03:15:01 -0000 1.2 @@ -71,7 +71,6 @@ <BR> <LI><A NAME="tex2html34" HREF="implement.html">Implementation: Ruby Dave Jones tree</A> -<UL> <BR> <LI><A NAME="tex2html40" HREF="conclusion.html">Conclusion</A> Index: index.html =================================================================== RCS file: /cvsroot/linuxconsole/ruby/web/htdocs/paper/index.html,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- index.html 3 May 2002 23:00:35 -0000 1.2 +++ index.html 29 May 2002 03:15:01 -0000 1.3 @@ -174,12 +174,12 @@ <BR> <LI><A NAME="tex2html34" HREF="implement.html">Implementation: Ruby Dave Jones tree</A> -<UL> <BR> <LI><A NAME="tex2html40" HREF="conclusion.html">Conclusion</A> <LI><A NAME="tex2html41" HREF="bio.html">Bibliography</A> +</UL> <!--End of Table of Child-Links--> <HR> <!--Navigation Panel--> Index: intro.html =================================================================== RCS file: /cvsroot/linuxconsole/ruby/web/htdocs/paper/intro.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- intro.html 3 May 2002 22:50:19 -0000 1.3 +++ intro.html 29 May 2002 03:15:01 -0000 1.4 @@ -71,7 +71,7 @@ As you can see the TTY layer covers many types of pieces of hardware. Because it does cover so many types this presents very difficult issues. What we have seen is no clear boundaries between the various types of devices. You see -things like pieces of tty/console code sprinckled throughout various low level +things like pieces of tty/console code sprinkled throughout various low level drivers. This makes driver writing more complex than it needs to be. <P> |
|
From: johann d. <jd...@us...> - 2002-05-28 17:16:30
|
Update of /cvsroot/linuxconsole/ruby/linux/drivers/usb/input In directory usw-pr-cvs1:/tmp/cvs-serv27193 Modified Files: hid-core.c Log Message: Fixed wait condition in hid_wait_io(). Index: hid-core.c =================================================================== RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/usb/input/hid-core.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- hid-core.c 26 Apr 2002 16:26:00 -0000 1.2 +++ hid-core.c 28 May 2002 17:16:25 -0000 1.3 @@ -1158,8 +1158,8 @@ set_current_state(TASK_UNINTERRUPTIBLE); add_wait_queue(&hid->wait, &wait); - while (timeout && test_bit(HID_CTRL_RUNNING, &hid->iofl) && - test_bit(HID_OUT_RUNNING, &hid->iofl)) + while (timeout && (test_bit(HID_CTRL_RUNNING, &hid->iofl) || + test_bit(HID_OUT_RUNNING, &hid->iofl))) timeout = schedule_timeout(timeout); set_current_state(TASK_RUNNING); |
|
From: johann d. <jd...@us...> - 2002-05-26 14:28:30
|
Update of /cvsroot/linuxconsole/ruby/linux/drivers/input
In directory usw-pr-cvs1:/tmp/cvs-serv18770
Modified Files:
evdev.c
Log Message:
Return -EFAULT instead -EINVAL when provided with bad addresses.
Index: evdev.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/input/evdev.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- evdev.c 20 Mar 2002 21:43:25 -0000 1.47
+++ evdev.c 26 May 2002 14:28:26 -0000 1.48
@@ -289,11 +289,11 @@
int err;
if (copy_from_user((void*)(&effect), (void*)arg, sizeof(effect))) {
- return -EINVAL;
+ return -EFAULT;
}
err = dev->upload_effect(dev, &effect);
if (put_user(effect.id, &(((struct ff_effect*)arg)->id))) {
- return -EINVAL;
+ return -EFAULT;
}
return err;
}
@@ -306,7 +306,8 @@
else return -ENOSYS;
case EVIOCGEFFECTS:
- put_user(dev->ff_effects_max, (int*) arg);
+ if (retval = put_user(dev->ff_effects_max, (int*) arg))
+ return retval;
return 0;
default:
|
|
From: James S. <jsi...@us...> - 2002-05-25 20:32:35
|
Update of /cvsroot/linuxconsole/ruby/linux/drivers/char
In directory usw-pr-cvs1:/tmp/cvs-serv32077/linux/drivers/char
Modified Files:
Makefile sysrq.c
Log Message:
Synced to 2.5.18
Index: Makefile
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/char/Makefile,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- Makefile 16 May 2002 18:01:39 -0000 1.39
+++ Makefile 25 May 2002 20:32:01 -0000 1.40
@@ -55,13 +55,7 @@
obj-$(CONFIG_AMIGA_BUILTIN_SERIAL) += amiserial.o
obj-$(CONFIG_A2232) += ser_a2232.o generic_serial.o
obj-$(CONFIG_SX) += sx.o generic_serial.o
-
-obj-$(CONFIG_RIO) += generic_serial.o
-subdir-$(CONFIG_RIO) += rio
-ifeq ($(CONFIG_RIO),y)
- obj-y += rio/rio.o
-endif
-
+obj-$(CONFIG_RIO) += rio/ generic_serial.o
obj-$(CONFIG_SH_SCI) += sh-sci.o generic_serial.o
obj-$(CONFIG_SERIAL167) += serial167.o
obj-$(CONFIG_MVME147_SCC) += generic_serial.o vme_scc.o
@@ -83,14 +77,8 @@
obj-$(CONFIG_I8K) += i8k.o
obj-$(CONFIG_DS1620) += ds1620.o
obj-$(CONFIG_INTEL_RNG) += i810_rng.o
-
obj-$(CONFIG_QIC02_TAPE) += tpqic02.o
-
-subdir-$(CONFIG_FTAPE) += ftape
-ifeq ($(CONFIG_FTAPE),y)
- obj-y += ftape/ftape.o
-endif
-
+obj-$(CONFIG_FTAPE) += ftape/
obj-$(CONFIG_H8) += h8.o
obj-$(CONFIG_PPDEV) += ppdev.o
obj-$(CONFIG_DZ) += dz.o
@@ -117,26 +105,10 @@
obj-$(CONFIG_SH_WDT) += shwdt.o
obj-$(CONFIG_EUROTECH_WDT) += eurotechwdt.o
obj-$(CONFIG_SOFT_WATCHDOG) += softdog.o
-
-subdir-$(CONFIG_MWAVE) += mwave
-ifeq ($(CONFIG_MWAVE),y)
- obj-y += mwave/mwave.o
-endif
-
-subdir-$(CONFIG_AGP) += agp
-ifeq ($(CONFIG_AGP),y)
- obj-y += agp/agp.o
-endif
-
-subdir-$(CONFIG_DRM) += drm
-ifeq ($(CONFIG_DRM),y)
- obj-y += drm/drm.o
-endif
-
-subdir-$(CONFIG_PCMCIA) += pcmcia
-ifeq ($(CONFIG_PCMCIA),y)
- obj-y += pcmcia/pcmcia_char.o
-endif
+obj-$(CONFIG_MWAVE) += mwave/
+obj-$(CONFIG_AGP) += agp/
+obj-$(CONFIG_DRM) += drm/
+obj-$(CONFIG_PCMCIA) += pcmcia/
include $(TOPDIR)/Rules.make
Index: sysrq.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/char/sysrq.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- sysrq.c 22 Mar 2002 20:13:58 -0000 1.20
+++ sysrq.c 25 May 2002 20:32:02 -0000 1.21
@@ -27,6 +27,8 @@
#include <linux/quotaops.h>
#include <linux/smp_lock.h>
#include <linux/module.h>
+#include <linux/suspend.h>
+#include <linux/buffer_head.h> /* for fsync_bdev()/wakeup_bdflush() */
#include <linux/spinlock.h>
@@ -329,6 +331,22 @@
action_msg: "Kill All Tasks",
};
+#ifdef CONFIG_SOFTWARE_SUSPEND
+static void sysrq_handle_swsusp(int key, struct pt_regs *pt_regs,
+ struct kbd_struct *kbd, struct tty_struct *tty) {
+ if(!software_suspend_enabled) {
+ printk("Software Suspend is not possible now\n");
+ return;
+ }
+ software_suspend();
+}
+static struct sysrq_key_op sysrq_swsusp_op = {
+ handler: sysrq_handle_swsusp,
+ help_msg: "suspenD",
+ action_msg: "Software suspend\n",
+};
+#endif
+
/* END SIGNAL SYSRQ HANDLERS BLOCK */
@@ -351,7 +369,11 @@
and will never arive */
/* b */ &sysrq_reboot_op,
/* c */ NULL,
+#ifdef CONFIG_SOFTWARE_SUSPEND
+/* d */ &sysrq_swsusp_op,
+#else
/* d */ NULL,
+#endif
/* e */ &sysrq_term_op,
/* f */ NULL,
/* g */ NULL,
|
|
From: James S. <jsi...@us...> - 2002-05-25 20:32:33
|
Update of /cvsroot/linuxconsole/ruby/linux/arch/ppc/kernel In directory usw-pr-cvs1:/tmp/cvs-serv32077/linux/arch/ppc/kernel Modified Files: ppc4xx_setup.c Log Message: Synced to 2.5.18 Index: ppc4xx_setup.c =================================================================== RCS file: /cvsroot/linuxconsole/ruby/linux/arch/ppc/kernel/ppc4xx_setup.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- ppc4xx_setup.c 16 May 2002 18:01:37 -0000 1.3 +++ ppc4xx_setup.c 25 May 2002 20:32:00 -0000 1.4 @@ -68,10 +68,6 @@ extern void pckbd_leds(unsigned char leds); extern void pckbd_init_hw(void); -extern int nonpci_ide_default_irq(ide_ioreg_t base); -extern void nonpci_ide_init_hwif_ports(hw_regs_t * hw, ide_ioreg_t data_port, - ide_ioreg_t ctrl_port, int *irq); - extern void ppc4xx_wdt_heartbeat(void); extern int wdt_enable; extern unsigned long wdt_period; @@ -376,11 +372,8 @@ ** defined(CONFIG_BLK_DEV_IDE) || defined(CONFIG_BLK_DEV_IDE_MODULE) */ #ifdef CONFIG_IDE -# if defined(CONFIG_PCI) +# ifdef CONFIG_PCI ppc_ide_md.ide_init_hwif = ppc4xx_ide_init_hwif_ports; -# elif defined (CONFIG_DMA_NONPCI) /* ON board IDE */ - ppc_ide_md.default_irq = nonpci_ide_default_irq; - ppc_ide_md.ide_init_hwif = nonpci_ide_init_hwif_ports; # endif #endif board_init(); |
|
From: James S. <jsi...@us...> - 2002-05-25 20:32:33
|
Update of /cvsroot/linuxconsole/ruby/linux/arch/parisc/kernel In directory usw-pr-cvs1:/tmp/cvs-serv32077/linux/arch/parisc/kernel Modified Files: Makefile Log Message: Synced to 2.5.18 Index: Makefile =================================================================== RCS file: /cvsroot/linuxconsole/ruby/linux/arch/parisc/kernel/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile 12 May 2001 17:10:28 -0000 1.1 +++ Makefile 25 May 2002 20:31:59 -0000 1.2 @@ -9,15 +9,9 @@ all: kernel.o init_task.o pdc_cons.o process.o head.o O_TARGET = kernel.o -O_OBJS = # Object file lists. -obj-y := -obj-m := -obj-n := -obj- := - obj-y += cache.o setup.o traps.o time.o irq.o \ syscall.o entry.o sys_parisc.o pdc.o ptrace.o hardware.o \ inventory.o drivers.o semaphore.o pa7300lc.o pci-dma.o \ @@ -37,15 +31,6 @@ # obj-$(CONFIG_IOMMU_CCIO) += ccio-rm-dma.o obj-$(CONFIG_IOMMU_CCIO) += ccio-dma.o -.o.S: $(CC) -D__ASSEMBLY__ $(AFLAGS) -traditional -c $*.S -o $*.o - -# Translate to Rules.make lists. - -O_OBJS := $(filter-out $(export-objs), $(obj-y)) -OX_OBJS := $(filter $(export-objs), $(obj-y)) -M_OBJS := $(sort $(filter-out $(export-objs), $(obj-m))) -MX_OBJS := $(sort $(filter $(export-objs), $(obj-m))) -MI_OBJS := $(sort $(filter-out $(export-objs), $(int-m))) -MIX_OBJS := $(sort $(filter $(export-objs), $(int-m))) +EXTRA_AFLAGS := -traditional include $(TOPDIR)/Rules.make |
|
From: James S. <jsi...@us...> - 2002-05-25 20:32:32
|
Update of /cvsroot/linuxconsole/ruby/linux/arch/mips/jazz In directory usw-pr-cvs1:/tmp/cvs-serv32077/linux/arch/mips/jazz Modified Files: Makefile Log Message: Synced to 2.5.18 Index: Makefile =================================================================== RCS file: /cvsroot/linuxconsole/ruby/linux/arch/mips/jazz/Makefile,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- Makefile 21 May 2002 04:06:05 -0000 1.4 +++ Makefile 25 May 2002 20:31:58 -0000 1.5 @@ -6,8 +6,6 @@ # unless it's something special (ie not a .c file). # -USE_STANDARD_AS_RULE := true - EXTRA_AFLAGS := $(CFLAGS) all: jazz.o |
|
From: James S. <jsi...@us...> - 2002-05-25 20:32:32
|
Update of /cvsroot/linuxconsole/ruby/linux/arch/mips64/mm In directory usw-pr-cvs1:/tmp/cvs-serv32077/linux/arch/mips64/mm Modified Files: fault.c Log Message: Synced to 2.5.18 Index: fault.c =================================================================== RCS file: /cvsroot/linuxconsole/ruby/linux/arch/mips64/mm/fault.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- fault.c 6 Oct 2001 16:11:12 -0000 1.2 +++ fault.c 25 May 2002 20:31:59 -0000 1.3 @@ -218,7 +218,7 @@ * or user mode. */ tsk->thread.cp0_badvaddr = address; - info.si_code = SIGBUS; + info.si_signo = SIGBUS; info.si_errno = 0; info.si_code = BUS_ADRERR; info.si_addr = (void *) address; |
|
From: James S. <jsi...@us...> - 2002-05-25 20:32:32
|
Update of /cvsroot/linuxconsole/ruby/linux
In directory usw-pr-cvs1:/tmp/cvs-serv32077/linux
Modified Files:
Makefile
Log Message:
Synced to 2.5.18
Index: Makefile
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/Makefile,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- Makefile 21 May 2002 04:06:05 -0000 1.59
+++ Makefile 25 May 2002 20:31:58 -0000 1.60
@@ -1,6 +1,6 @@
VERSION = 2
PATCHLEVEL = 5
-SUBLEVEL = 16
+SUBLEVEL = 18
EXTRAVERSION = -ruby
KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
@@ -11,7 +11,7 @@
CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \
else if [ -x /bin/bash ]; then echo /bin/bash; \
else echo sh; fi ; fi)
-TOPDIR := $(shell /bin/pwd)
+TOPDIR := $(CURDIR)
HPATH = $(TOPDIR)/include
FINDHPATH = $(HPATH)/asm $(HPATH)/linux $(HPATH)/scsi $(HPATH)/net
@@ -37,13 +37,21 @@
MAKEFILES = $(TOPDIR)/.config
GENKSYMS = /sbin/genksyms
DEPMOD = /sbin/depmod
+PERL = perl
MODFLAGS = -DMODULE
+CFLAGS_MODULE = $(MODFLAGS)
+AFLAGS_MODULE =
CFLAGS_KERNEL =
-PERL = perl
+AFLAGS_KERNEL =
+EXPORT_FLAGS =
export VERSION PATCHLEVEL SUBLEVEL EXTRAVERSION KERNELRELEASE ARCH \
CONFIG_SHELL TOPDIR HPATH HOSTCC HOSTCFLAGS CROSS_COMPILE AS LD CC \
- CPP AR NM STRIP OBJCOPY OBJDUMP MAKE MAKEFILES GENKSYMS MODFLAGS PERL
+ CPP AR NM STRIP OBJCOPY OBJDUMP MAKE MAKEFILES GENKSYMS PERL
+
+export CPPFLAGS EXPORT_FLAGS
+export CFLAGS CFLAGS_KERNEL CFLAGS_MODULE
+export AFLAGS AFLAGS_KERNEL AFLAGS_MODULE
all: do-it-all
@@ -54,9 +62,8 @@
ifeq (.config,$(wildcard .config))
include .config
-ifeq (.depend,$(wildcard .depend))
-include .depend
-do-it-all: Version vmlinux
+ifeq (.hdepend,$(wildcard .hdepend))
+do-it-all: vmlinux
else
CONFIGURATION = depend
do-it-all: depend
@@ -92,37 +99,16 @@
-fomit-frame-pointer -fno-strict-aliasing -fno-common
AFLAGS := -D__ASSEMBLY__ $(CPPFLAGS)
-#
-# ROOT_DEV specifies the default root-device when making the image.
-# This can be either FLOPPY, CURRENT, /dev/xxxx or empty, in which case
-# the default of FLOPPY is used by 'build'.
-# This is i386 specific.
-#
-
-export ROOT_DEV = CURRENT
-
-#
-# If you want to preset the SVGA mode, uncomment the next line and
-# set SVGA_MODE to whatever number you want.
-# Set it to -DSVGA_MODE=NORMAL_VGA if you just want the EGA/VGA mode.
-# The number is the same as you would ordinarily press at bootup.
-# This is i386 specific.
-#
-
-export SVGA_MODE = -DSVGA_MODE=NORMAL_VGA
-
-#
-# If you want the RAM disk device, define this to be the size in blocks.
-# This is i386 specific.
-#
-
-#export RAMDISK = -DRAMDISK=512
+ifdef CONFIG_MODULES
+EXPORT_FLAGS := -DEXPORT_SYMTAB
+endif
+INIT =init/init.o
CORE_FILES =kernel/kernel.o mm/mm.o fs/fs.o ipc/ipc.o
NETWORKS =net/network.o
LIBS =$(TOPDIR)/lib/lib.a
-SUBDIRS =kernel lib drivers mm fs net ipc sound
+SUBDIRS =init kernel lib drivers mm fs net ipc sound
DRIVERS-n :=
DRIVERS-y :=
@@ -140,10 +126,10 @@
drivers/net/net.o \
drivers/media/media.o \
drivers/video/video.o
-DRIVERS-$(CONFIG_NUBUS) += drivers/nubus/nubus.a
+DRIVERS-$(CONFIG_NUBUS) += drivers/nubus/built-in.o
DRIVERS-$(CONFIG_ATM) += drivers/atm/atm.o
DRIVERS-$(CONFIG_IDE) += drivers/ide/idedriver.o
-DRIVERS-$(CONFIG_FC4) += drivers/fc4/fc4.a
+DRIVERS-$(CONFIG_FC4) += drivers/fc4/built-in.o
DRIVERS-$(CONFIG_SCSI) += drivers/scsi/scsidrv.o
DRIVERS-$(CONFIG_FUSION) += drivers/message/message.o
DRIVERS-$(CONFIG_IEEE1394) += drivers/ieee1394/ieee1394drv.o
@@ -155,15 +141,15 @@
DRIVERS-$(CONFIG_SOUND) += sound/sound.o
DRIVERS-$(CONFIG_MTD) += drivers/mtd/mtdlink.o
DRIVERS-$(CONFIG_PCMCIA) += drivers/pcmcia/pcmcia.o
-DRIVERS-$(CONFIG_DIO) += drivers/dio/dio.a
+DRIVERS-$(CONFIG_DIO) += drivers/dio/built-in.o
DRIVERS-$(CONFIG_SBUS) += drivers/sbus/sbus_all.o
DRIVERS-$(CONFIG_ZORRO) += drivers/zorro/driver.o
DRIVERS-$(CONFIG_ALL_PPC) += drivers/macintosh/macintosh.o
DRIVERS-$(CONFIG_MAC) += drivers/macintosh/macintosh.o
DRIVERS-$(CONFIG_PNP) += drivers/pnp/pnp.o
-DRIVERS-$(CONFIG_SGI_IP22) += drivers/sgi/sgi.a
-DRIVERS-$(CONFIG_PARIDE) += drivers/block/paride/paride.a
-DRIVERS-$(CONFIG_TC) += drivers/tc/tc.a
+DRIVERS-$(CONFIG_SGI_IP22) += drivers/sgi/built-in.o
+DRIVERS-$(CONFIG_PARIDE) += drivers/block/paride/built-in.o
+DRIVERS-$(CONFIG_TC) += drivers/tc/built-in.o
DRIVERS-$(CONFIG_USB) += drivers/usb/usbdrv.o
DRIVERS-$(CONFIG_INPUT) += drivers/input/inputdrv.o
DRIVERS-$(CONFIG_GAMEPORT) += drivers/input/gameport/gamedrv.o
@@ -179,77 +165,29 @@
DRIVERS := $(DRIVERS-y)
-# files removed with 'make clean'
-CLEAN_FILES = \
- kernel/ksyms.lst include/linux/compile.h \
- vmlinux System.map \
- .tmp* \
- drivers/char/consolemap_deftbl.c drivers/video/promcon_tbl.c \
- drivers/char/conmakehash \
- drivers/char/drm/*-mod.c \
- drivers/pci/devlist.h drivers/pci/classlist.h drivers/pci/gen-devlist \
- drivers/zorro/devlist.h drivers/zorro/gen-devlist \
- sound/oss/bin2hex sound/oss/hex2hex \
- drivers/atm/fore200e_mkfirm drivers/atm/{pca,sba}*{.bin,.bin1,.bin2} \
- drivers/scsi/aic7xxx/aicasm/aicasm_gram.c \
- drivers/scsi/aic7xxx/aicasm/aicasm_scan.c \
- drivers/scsi/aic7xxx/aicasm/y.tab.h \
- drivers/scsi/aic7xxx/aicasm/aicasm \
- drivers/scsi/53c700_d.h \
- net/khttpd/make_times_h \
- net/khttpd/times.h \
- submenu*
-# directories removed with 'make clean'
-CLEAN_DIRS = \
- modules
-
-# files removed with 'make mrproper'
-MRPROPER_FILES = \
- include/linux/autoconf.h include/linux/version.h \
- drivers/net/hamradio/soundmodem/sm_tbl_{afsk1200,afsk2666,fsk9600}.h \
- drivers/net/hamradio/soundmodem/sm_tbl_{hapn4800,psk4800}.h \
- drivers/net/hamradio/soundmodem/sm_tbl_{afsk2400_7,afsk2400_8}.h \
- drivers/net/hamradio/soundmodem/gentbl \
- sound/oss/*_boot.h sound/oss/.*.boot \
- sound/oss/msndinit.c \
- sound/oss/msndperm.c \
- sound/oss/pndsperm.c \
- sound/oss/pndspini.c \
- drivers/atm/fore200e_*_fw.c drivers/atm/.fore200e_*.fw \
- .version .config* config.in config.old \
- scripts/tkparse scripts/kconfig.tk scripts/kconfig.tmp \
- scripts/lxdialog/*.o scripts/lxdialog/lxdialog \
- .menuconfig.log \
- include/asm \
- .hdepend scripts/mkdep scripts/split-include scripts/docproc \
- $(TOPDIR)/include/linux/modversions.h \
- kernel.spec
-
-# directories removed with 'make mrproper'
-MRPROPER_DIRS = \
- include/config \
- $(TOPDIR)/include/linux/modules
-
-
include arch/$(ARCH)/Makefile
-export CPPFLAGS CFLAGS CFLAGS_KERNEL AFLAGS AFLAGS_KERNEL
-
export NETWORKS DRIVERS LIBS HEAD LDFLAGS LINKFLAGS MAKEBOOT ASFLAGS
-.S.s:
- $(CPP) $(AFLAGS) $(AFLAGS_KERNEL) -traditional -o $*.s $<
-.S.o:
- $(CC) $(AFLAGS) $(AFLAGS_KERNEL) -traditional -c -o $*.o $<
-
-Version: dummy
- @rm -f include/linux/compile.h
+# boot target
+# ---------------------------------------------------------------------------
boot: vmlinux
- @$(MAKE) CFLAGS="$(CFLAGS) $(CFLAGS_KERNEL)" -C arch/$(ARCH)/boot
+ @$(MAKE) CFLAGS="$(CFLAGS) $(CFLAGS_KERNEL)" AFLAGS="$(AFLAGS) $(AFLAGS_KERNEL)" -C arch/$(ARCH)/boot
-vmlinux: include/linux/version.h $(CONFIGURATION) init/main.o init/version.o init/do_mounts.o linuxsubdirs
- $(LD) $(LINKFLAGS) $(HEAD) init/main.o init/version.o init/do_mounts.o \
+# Build vmlinux
+# ---------------------------------------------------------------------------
+
+# This is a bit tricky: If we need to relink vmlinux, we want
+# the version number incremented, which means recompile init/version.o
+# and relink init/init.o. However, we cannot do this during the
+# normal descending-into-subdirs phase, since at that time
+# we cannot yet know if we will need to relink vmlinux.
+# So we descend into init/ inside the rule for vmlinux again.
+
+vmlinux-objs := $(HEAD) $(INIT) $(CORE_FILES) $(LIBS) $(DRIVERS) $(NETWORKS)
+
+cmd_link_vmlinux = $(LD) $(LINKFLAGS) $(HEAD) $(INIT) \
--start-group \
$(CORE_FILES) \
$(LIBS) \
@@ -257,96 +195,99 @@
$(NETWORKS) \
--end-group \
-o vmlinux
+
+# set -e makes the rule exit immediately on error
+
+define rule_link_vmlinux
+ set -e
+ echo Generating build number
+ . scripts/mkversion > .tmpversion
+ mv -f .tmpversion .version
+ $(MAKE) CFLAGS="$(CFLAGS) $(CFLAGS_KERNEL)" AFLAGS="$(AFLAGS) $(AFLAGS_KERNEL)" -C init
+ echo $(cmd_link_vmlinux)
+ $(cmd_link_vmlinux)
+ echo 'cmd_$@ := $(cmd_link_vmlinux)' > $(@D)/.$(@F).cmd
$(NM) vmlinux | grep -v '\(compiled\)\|\(\.o$$\)\|\( [aUw] \)\|\(\.\.ng$$\)\|\(LASH[RL]DI\)' | sort > System.map
+endef
-symlinks:
- rm -f include/asm
- ( cd include ; ln -sf asm-$(ARCH) asm)
- @if [ ! -d include/linux/modules ]; then \
- mkdir include/linux/modules; \
- fi
+vmlinux: $(CONFIGURATION) $(vmlinux-objs) dummy
+ $(call if_changed_rule,link_vmlinux)
+
+# The actual objects are generated when descending, make sure
+# no implicit rule kicks in
+
+$(sort $(vmlinux-objs)): linuxsubdirs
+ @
+
+# Handle descending into subdirectories listed in $(SUBDIRS)
+
+.PHONY: linuxsubdirs
+linuxsubdirs: $(patsubst %, _dir_%, $(SUBDIRS))
+
+$(patsubst %, _dir_%, $(SUBDIRS)) : dummy include/linux/version.h include/config/MARKER
+ @$(MAKE) CFLAGS="$(CFLAGS) $(CFLAGS_KERNEL)" AFLAGS="$(AFLAGS) $(AFLAGS_KERNEL)" -C $(patsubst _dir_%, %, $@)
+
+# Configuration
+# ---------------------------------------------------------------------------
oldconfig: symlinks
$(CONFIG_SHELL) scripts/Configure -d arch/$(ARCH)/config.in
xconfig: symlinks
- $(MAKE) -C scripts kconfig.tk
+ @$(MAKE) -C scripts kconfig.tk
wish -f scripts/kconfig.tk
menuconfig: include/linux/version.h symlinks
- $(MAKE) -C scripts/lxdialog all
+ @$(MAKE) -C scripts/lxdialog all
$(CONFIG_SHELL) scripts/Menuconfig arch/$(ARCH)/config.in
config: symlinks
$(CONFIG_SHELL) scripts/Configure arch/$(ARCH)/config.in
+# make asm->asm-$(ARCH) symlink
+
+symlinks:
+ rm -f include/asm
+ ( cd include ; ln -sf asm-$(ARCH) asm)
+ @if [ ! -d include/linux/modules ]; then \
+ mkdir include/linux/modules; \
+ fi
+
+# split autoconf.h into include/linux/config/*
+
include/config/MARKER: scripts/split-include include/linux/autoconf.h
scripts/split-include include/linux/autoconf.h include/config
@ touch include/config/MARKER
-linuxsubdirs: $(patsubst %, _dir_%, $(SUBDIRS))
-
-$(patsubst %, _dir_%, $(SUBDIRS)) : dummy include/linux/version.h include/config/MARKER
- $(MAKE) CFLAGS="$(CFLAGS) $(CFLAGS_KERNEL)" -C $(patsubst _dir_%, %, $@)
+# Generate some files
$(TOPDIR)/include/linux/version.h: include/linux/version.h
-$(TOPDIR)/include/linux/compile.h: include/linux/compile.h
-
-newversion:
- . scripts/mkversion > .tmpversion
- @mv -f .tmpversion .version
-
-include/linux/compile.h: $(CONFIGURATION) include/linux/version.h newversion
- @echo -n \#define UTS_VERSION \"\#`cat .version` > .ver
- @if [ -n "$(CONFIG_SMP)" ] ; then echo -n " SMP" >> .ver; fi
- @if [ -f .name ]; then echo -n \-`cat .name` >> .ver; fi
- @echo ' '`date`'"' >> .ver
- @echo \#define LINUX_COMPILE_TIME \"`date +%T`\" >> .ver
- @echo \#define LINUX_COMPILE_BY \"`whoami`\" >> .ver
- @echo \#define LINUX_COMPILE_HOST \"`hostname`\" >> .ver
- @if [ -x /bin/dnsdomainname ]; then \
- echo \#define LINUX_COMPILE_DOMAIN \"`dnsdomainname`\"; \
- elif [ -x /bin/domainname ]; then \
- echo \#define LINUX_COMPILE_DOMAIN \"`domainname`\"; \
- else \
- echo \#define LINUX_COMPILE_DOMAIN ; \
- fi >> .ver
- @echo \#define LINUX_COMPILER \"`$(CC) $(CFLAGS) -v 2>&1 | tail -1`\" >> .ver
- @mv -f .ver $@
include/linux/version.h: ./Makefile
- @echo \#define UTS_RELEASE \"$(KERNELRELEASE)\" > .ver
- @echo \#define LINUX_VERSION_CODE `expr $(VERSION) \\* 65536 + $(PATCHLEVEL) \\* 256 + $(SUBLEVEL)` >> .ver
- @echo '#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))' >>.ver
- @mv -f .ver $@
+ @echo Generating $@
+ @. scripts/mkversion_h $@ $(KERNELRELEASE) $(VERSION) $(PATCHLEVEL) $(SUBLEVEL)
comma := ,
-init/version.o: init/version.c include/linux/compile.h include/config/MARKER
- $(CC) $(CFLAGS) $(CFLAGS_KERNEL) -DUTS_MACHINE='"$(ARCH)"' -DKBUILD_BASENAME=$(subst $(comma),_,$(subst -,_,$(*F))) -c -o init/version.o init/version.c
+# ---------------------------------------------------------------------------
+# Generate dependencies
-init/main.o: init/main.c include/config/MARKER
- $(CC) $(CFLAGS) $(CFLAGS_KERNEL) $(PROFILING) -DKBUILD_BASENAME=$(subst $(comma),_,$(subst -,_,$(*F))) -c -o $*.o $<
+depend dep: dep-files
-init/do_mounts.o: init/do_mounts.c include/config/MARKER
- $(CC) $(CFLAGS) $(CFLAGS_KERNEL) $(PROFILING) -DKBUILD_BASENAME=$(subst $(comma),_,$(subst -,_,$(*F))) -c -o $*.o $<
+dep-files: scripts/mkdep archdep include/linux/version.h
+ scripts/mkdep -- `find $(FINDHPATH) -name SCCS -prune -o -follow -name \*.h ! -name modversions.h -print` > .hdepend
+ $(MAKE) $(patsubst %,_sfdep_%,$(SUBDIRS)) _FASTDEP_ALL_SUB_DIRS="$(SUBDIRS)"
+ifdef CONFIG_MODVERSIONS
+ $(MAKE) update-modverfile
+endif
-fs lib mm ipc kernel drivers net sound: dummy
- $(MAKE) CFLAGS="$(CFLAGS) $(CFLAGS_KERNEL)" $(subst $@, _dir_$@, $@)
+# ---------------------------------------------------------------------------
+# Modules
-TAGS: dummy
- { find include/asm-${ARCH} -name '*.h' -print ; \
- find include -type d \( -name "asm-*" -o -name config \) -prune -o -name '*.h' -print ; \
- find $(SUBDIRS) init -name '*.[ch]' ; } | grep -v SCCS | etags -
+ifdef CONFIG_MODULES
-# Exuberant ctags works better with -I
-tags: dummy
- CTAGSF=`ctags --version | grep -i exuberant >/dev/null && echo "-I __initdata,__exitdata,EXPORT_SYMBOL,EXPORT_SYMBOL_NOVERS"`; \
- ctags $$CTAGSF `find include/asm-$(ARCH) -name '*.h'` && \
- find include -type d \( -name "asm-*" -o -name config \) -prune -o -name '*.h' -print | xargs ctags $$CTAGSF -a && \
- find $(SUBDIRS) init -name '*.[ch]' | xargs ctags $$CTAGSF -a
+# Build modules
-ifdef CONFIG_MODULES
ifdef CONFIG_MODVERSIONS
MODFLAGS += -DMODVERSIONS -include $(HPATH)/linux/modversions.h
endif
@@ -356,7 +297,9 @@
.PHONY: $(patsubst %, _mod_%, $(SUBDIRS))
$(patsubst %, _mod_%, $(SUBDIRS)) : include/linux/version.h include/config/MARKER
- $(MAKE) -C $(patsubst _mod_%, %, $@) CFLAGS="$(CFLAGS) $(MODFLAGS)" MAKING_MODULES=1 modules
+ @$(MAKE) -C $(patsubst _mod_%, %, $@) CFLAGS="$(CFLAGS) $(CFLAGS_MODULE)" AFLAGS="$(AFLAGS) $(AFLAGS_MODULE)" modules
+
+# Install modules
.PHONY: modules_install
modules_install: _modinst_ $(patsubst %, _modinst_%, $(SUBDIRS)) _modinst_post
@@ -384,11 +327,13 @@
.PHONY: $(patsubst %, _modinst_%, $(SUBDIRS))
$(patsubst %, _modinst_%, $(SUBDIRS)) :
- $(MAKE) -C $(patsubst _modinst_%, %, $@) modules_install
+ @$(MAKE) -C $(patsubst _modinst_%, %, $@) modules_install
-# modules disabled....
+else # CONFIG_MODULES
+
+# ---------------------------------------------------------------------------
+# Modules not configured
-else
modules modules_install: dummy
@echo
@echo "The present kernel configuration has modules disabled."
@@ -396,20 +341,92 @@
@echo "Then build a kernel with module support enabled."
@echo
@exit 1
-endif
+
+endif # CONFIG_MODULES
+
+# ---------------------------------------------------------------------------
+
+include Rules.make
+
+# Build helpers in scripts/
+# FIXME: do that in scripts/Makefile?
+
+scripts/mkdep: scripts/mkdep.c
+ $(HOSTCC) $(HOSTCFLAGS) -o scripts/mkdep scripts/mkdep.c
+
+scripts/split-include: scripts/split-include.c
+ $(HOSTCC) $(HOSTCFLAGS) -o scripts/split-include scripts/split-include.c
+
+# Cleaning up
+# ---------------------------------------------------------------------------
+
+# files removed with 'make clean'
+CLEAN_FILES += \
+ kernel/ksyms.lst include/linux/compile.h \
+ vmlinux System.map \
+ .tmp* \
+ drivers/char/consolemap_deftbl.c drivers/video/promcon_tbl.c \
+ drivers/char/conmakehash \
+ drivers/char/drm/*-mod.c \
+ drivers/pci/devlist.h drivers/pci/classlist.h drivers/pci/gen-devlist \
+ drivers/zorro/devlist.h drivers/zorro/gen-devlist \
+ sound/oss/bin2hex sound/oss/hex2hex \
+ drivers/atm/fore200e_mkfirm drivers/atm/{pca,sba}*{.bin,.bin1,.bin2} \
+ drivers/scsi/aic7xxx/aic7xxx_seq.h \
+ drivers/scsi/aic7xxx/aic7xxx_reg.h \
+ drivers/scsi/aic7xxx/aicasm/aicasm_gram.c \
+ drivers/scsi/aic7xxx/aicasm/aicasm_scan.c \
+ drivers/scsi/aic7xxx/aicasm/y.tab.h \
+ drivers/scsi/aic7xxx/aicasm/aicasm \
+ drivers/scsi/53c700_d.h \
+ net/khttpd/make_times_h \
+ net/khttpd/times.h \
+ submenu*
+
+# directories removed with 'make clean'
+CLEAN_DIRS += \
+ modules
+
+# files removed with 'make mrproper'
+MRPROPER_FILES += \
+ include/linux/autoconf.h include/linux/version.h \
+ drivers/net/hamradio/soundmodem/sm_tbl_{afsk1200,afsk2666,fsk9600}.h \
+ drivers/net/hamradio/soundmodem/sm_tbl_{hapn4800,psk4800}.h \
+ drivers/net/hamradio/soundmodem/sm_tbl_{afsk2400_7,afsk2400_8}.h \
+ drivers/net/hamradio/soundmodem/gentbl \
+ sound/oss/*_boot.h sound/oss/.*.boot \
+ sound/oss/msndinit.c \
+ sound/oss/msndperm.c \
+ sound/oss/pndsperm.c \
+ sound/oss/pndspini.c \
+ drivers/atm/fore200e_*_fw.c drivers/atm/.fore200e_*.fw \
+ .version .config* config.in config.old \
+ scripts/tkparse scripts/kconfig.tk scripts/kconfig.tmp \
+ scripts/lxdialog/*.o scripts/lxdialog/lxdialog \
+ .menuconfig.log \
+ include/asm \
+ .hdepend scripts/mkdep scripts/split-include scripts/docproc \
+ $(TOPDIR)/include/linux/modversions.h \
+ kernel.spec
+
+# directories removed with 'make mrproper'
+MRPROPER_DIRS += \
+ include/config \
+ $(TOPDIR)/include/linux/modules
+
clean: archclean
- find . \( -name '*.[oas]' -o -name core -o -name '.*.flags' \) -type f -print \
+ find . \( -name '*.[oas]' -o -name core -o -name '.*.cmd' \) -type f -print \
| grep -v lxdialog/ | xargs rm -f
rm -f $(CLEAN_FILES)
rm -rf $(CLEAN_DIRS)
- $(MAKE) -C Documentation/DocBook clean
+ @$(MAKE) -C Documentation/DocBook clean
mrproper: clean archmrproper
find . \( -size 0 -o -name .depend \) -type f -print | xargs rm -f
rm -f $(MRPROPER_FILES)
rm -rf $(MRPROPER_DIRS)
- $(MAKE) -C Documentation/DocBook mrproper
+ @$(MAKE) -C Documentation/DocBook mrproper
distclean: mrproper
rm -f core `find . \( -not -type d \) -and \
@@ -417,44 +434,41 @@
-o -name '*.bak' -o -name '#*#' -o -name '.*.orig' \
-o -name '.*.rej' -o -name '.SUMS' -o -size 0 \) -type f -print` TAGS tags
-backup: mrproper
- cd .. && tar cf - linux/ | gzip -9 > backup.gz
- sync
+# Assorted miscellaneous targets
+# ---------------------------------------------------------------------------
-sgmldocs:
- chmod 755 $(TOPDIR)/scripts/docgen
- chmod 755 $(TOPDIR)/scripts/gen-all-syms
- chmod 755 $(TOPDIR)/scripts/kernel-doc
- $(MAKE) -C $(TOPDIR)/Documentation/DocBook books
+# Documentation targets
-psdocs: sgmldocs
- $(MAKE) -C Documentation/DocBook ps
+sgmldocs psdocs pdfdocs htmldocs:
+ @$(MAKE) -C Documentation/DocBook $@
-pdfdocs: sgmldocs
- $(MAKE) -C Documentation/DocBook pdf
-htmldocs: sgmldocs
- $(MAKE) -C Documentation/DocBook html
+# RPM target
+#
+# If you do a make spec before packing the tarball you can rpm -ta it
-sums:
- find . -type f -print | sort | xargs sum > .SUMS
+spec:
+ . scripts/mkspec >kernel.spec
-dep-files: scripts/mkdep archdep include/linux/version.h
- scripts/mkdep -- init/*.c > .depend
- scripts/mkdep -- `find $(FINDHPATH) -name SCCS -prune -o -follow -name \*.h ! -name modversions.h -print` > .hdepend
- $(MAKE) $(patsubst %,_sfdep_%,$(SUBDIRS)) _FASTDEP_ALL_SUB_DIRS="$(SUBDIRS)"
-ifdef CONFIG_MODVERSIONS
- $(MAKE) update-modverfile
-endif
+# Build a tar ball, generate an rpm from it and pack the result
+# There arw two bits of magic here
+# 1) The use of /. to avoid tar packing just the symlink
+# 2) Removing the .dep files as they have source paths in them that
+# will become invalid
-ifdef CONFIG_MODVERSIONS
-MODVERFILE := $(TOPDIR)/include/linux/modversions.h
-else
-MODVERFILE :=
-endif
-export MODVERFILE
+rpm: clean spec
+ find . \( -size 0 -o -name .depend -o -name .hdepend \) -type f -print | xargs rm -f
+ set -e; \
+ cd $(TOPDIR)/.. ; \
+ ln -sf $(TOPDIR) $(KERNELPATH) ; \
+ tar -cvz --exclude CVS -f $(KERNELPATH).tar.gz $(KERNELPATH)/. ; \
+ rm $(KERNELPATH) ; \
+ cd $(TOPDIR) ; \
+ . scripts/mkversion > .version ; \
+ rpm -ta $(TOPDIR)/../$(KERNELPATH).tar.gz ; \
+ rm $(TOPDIR)/../$(KERNELPATH).tar.gz
-depend dep: dep-files
+# Scripts to check various things for consistency
checkconfig:
find * -name '*.[hcS]' -type f -print | sort | xargs $(PERL) -w scripts/checkconfig.pl
@@ -465,61 +479,45 @@
checkincludes:
find * -name '*.[hcS]' -type f -print | sort | xargs $(PERL) -w scripts/checkincludes.pl
-ifdef CONFIGURATION
-..$(CONFIGURATION):
- @echo
- @echo "You have a bad or nonexistent" .$(CONFIGURATION) ": running 'make" $(CONFIGURATION)"'"
- @echo
- $(MAKE) $(CONFIGURATION)
- @echo
- @echo "Successful. Try re-making (ignore the error that follows)"
- @echo
- exit 1
+# Generate tags for editors
-#dummy: ..$(CONFIGURATION)
-dummy:
+TAGS: dummy
+ { find include/asm-${ARCH} -name '*.h' -print ; \
+ find include -type d \( -name "asm-*" -o -name config \) -prune -o -name '*.h' -print ; \
+ find $(SUBDIRS) init -name '*.[ch]' ; } | grep -v SCCS | etags -
-else
+# Exuberant ctags works better with -I
+tags: dummy
+ CTAGSF=`ctags --version | grep -i exuberant >/dev/null && echo "-I __initdata,__exitdata,EXPORT_SYMBOL,EXPORT_SYMBOL_NOVERS"`; \
+ ctags $$CTAGSF `find include/asm-$(ARCH) -name '*.h'` && \
+ find include -type d \( -name "asm-*" -o -name config \) -prune -o -name '*.h' -print | xargs ctags $$CTAGSF -a && \
+ find $(SUBDIRS) init -name '*.[ch]' | xargs ctags $$CTAGSF -a
-dummy:
+# Targets which will only descend into one subdir, not trying
+# to link vmlinux afterwards
+# FIXME: anybody still using this?
-endif
+fs lib mm ipc kernel drivers net sound: dummy
+ $(MAKE) CFLAGS="$(CFLAGS) $(CFLAGS_KERNEL)" AFLAGS="$(AFLAGS) $(AFLAGS_KERNEL)" $(subst $@, _dir_$@, $@)
-include Rules.make
+# Make a backup
+# FIXME anybody still using this?
-#
-# This generates dependencies for the .h files.
-#
+backup: mrproper
+ cd .. && tar cf - linux/ | gzip -9 > backup.gz
+ sync
-scripts/mkdep: scripts/mkdep.c
- $(HOSTCC) $(HOSTCFLAGS) -o scripts/mkdep scripts/mkdep.c
+# Make checksums
+# FIXME anybody still using this?
-scripts/split-include: scripts/split-include.c
- $(HOSTCC) $(HOSTCFLAGS) -o scripts/split-include scripts/split-include.c
+sums:
+ find . -type f -print | sort | xargs sum > .SUMS
-#
-# RPM target
-#
-# If you do a make spec before packing the tarball you can rpm -ta it
-#
-spec:
- . scripts/mkspec >kernel.spec
+# FIXME Should go into a make.lib or something
+# ---------------------------------------------------------------------------
+
+if_changed_rule = $(if $(strip $? \
+ $(filter-out $(cmd_$(1)),$(cmd_$(@F)))\
+ $(filter-out $(cmd_$(@F)),$(cmd_$(1)))),\
+ @$(rule_$(1)))
-#
-# Build a tar ball, generate an rpm from it and pack the result
-# There arw two bits of magic here
-# 1) The use of /. to avoid tar packing just the symlink
-# 2) Removing the .dep files as they have source paths in them that
-# will become invalid
-#
-rpm: clean spec
- find . \( -size 0 -o -name .depend -o -name .hdepend \) -type f -print | xargs rm -f
- set -e; \
- cd $(TOPDIR)/.. ; \
- ln -sf $(TOPDIR) $(KERNELPATH) ; \
- tar -cvz --exclude CVS -f $(KERNELPATH).tar.gz $(KERNELPATH)/. ; \
- rm $(KERNELPATH) ; \
- cd $(TOPDIR) ; \
- . scripts/mkversion > .version ; \
- rpm -ta $(TOPDIR)/../$(KERNELPATH).tar.gz ; \
- rm $(TOPDIR)/../$(KERNELPATH).tar.gz
|
|
From: James S. <jsi...@us...> - 2002-05-25 20:32:32
|
Update of /cvsroot/linuxconsole/ruby/linux/arch/i386/kernel
In directory usw-pr-cvs1:/tmp/cvs-serv32077/linux/arch/i386/kernel
Modified Files:
apm.c setup.c
Log Message:
Synced to 2.5.18
Index: apm.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/arch/i386/kernel/apm.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- apm.c 1 May 2002 18:07:49 -0000 1.4
+++ apm.c 25 May 2002 20:31:58 -0000 1.5
@@ -1667,6 +1667,7 @@
daemonize();
strcpy(current->comm, "kapmd");
+ current->flags |= PF_IOTHREAD;
sigfillset(¤t->blocked);
if (apm_info.connection_version == 0) {
@@ -2024,5 +2025,3 @@
MODULE_PARM(idle_period, "i");
MODULE_PARM_DESC(idle_period,
"Period (in sec/100) over which to caculate the idle percentage");
-
-EXPORT_NO_SYMBOLS;
Index: setup.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/arch/i386/kernel/setup.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- setup.c 21 May 2002 04:06:05 -0000 1.42
+++ setup.c 25 May 2002 20:31:58 -0000 1.43
@@ -165,6 +165,8 @@
static int disable_x86_serial_nr __initdata = 1;
static int disable_x86_fxsr __initdata = 0;
+extern unsigned long saved_videomode;
+
/*
* This is set up by the setup-routine at boot-time
*/
@@ -179,6 +181,7 @@
#define SYS_DESC_TABLE (*(struct sys_desc_table_struct*)(PARAM+0xa0))
#define MOUNT_ROOT_RDONLY (*(unsigned short *) (PARAM+0x1F2))
#define RAMDISK_FLAGS (*(unsigned short *) (PARAM+0x1F8))
+#define VIDEO_MODE (*(unsigned short *) (PARAM+0x1FA))
#define ORIG_ROOT_DEV (*(unsigned short *) (PARAM+0x1FC))
#define AUX_DEVICE_INFO (*(unsigned char *) (PARAM+0x1FF))
#define LOADER_TYPE (*(unsigned char *) (PARAM+0x210))
@@ -678,6 +681,10 @@
drive_info = DRIVE_INFO;
screen_info = SCREEN_INFO;
apm_info.bios = APM_BIOS_INFO;
+#ifdef CONFIG_ACPI_SLEEP
+ saved_videomode = VIDEO_MODE;
+ printk("Video mode to be used for restore is %lx\n", saved_videomode);
+#endif
if( SYS_DESC_TABLE.length != 0 ) {
MCA_bus = SYS_DESC_TABLE.table[3] &0x2;
machine_id = SYS_DESC_TABLE.table[0];
@@ -1214,7 +1221,7 @@
* here.
*/
if (c->x86_model == 6 || c->x86_model == 7) {
- if (!test_bit(X86_FEATURE_XMM, c->x86_capability)) {
+ if (!cpu_has(c, X86_FEATURE_XMM)) {
printk(KERN_INFO "Enabling disabled K7/SSE Support.\n");
rdmsr(MSR_K7_HWCR, l, h);
l &= ~0x00008000;
@@ -2141,7 +2148,7 @@
strcpy(c->x86_model_id, p);
#ifdef CONFIG_SMP
- if (test_bit(X86_FEATURE_HT, c->x86_capability)) {
+ if (cpu_has(c, X86_FEATURE_HT)) {
extern int phys_proc_id[NR_CPUS];
u32 eax, ebx, ecx, edx;
@@ -2310,8 +2317,7 @@
static void __init squash_the_stupid_serial_number(struct cpuinfo_x86 *c)
{
- if( test_bit(X86_FEATURE_PN, c->x86_capability) &&
- disable_x86_serial_nr ) {
+ if (cpu_has(c, X86_FEATURE_PN) && disable_x86_serial_nr ) {
/* Disable processor serial number */
unsigned long lo,hi;
rdmsr(MSR_IA32_BBL_CR_CTL,lo,hi);
@@ -2748,7 +2754,7 @@
else
seq_printf(m, "stepping\t: unknown\n");
- if ( test_bit(X86_FEATURE_TSC, c->x86_capability) ) {
+ if ( cpu_has(c, X86_FEATURE_TSC) ) {
seq_printf(m, "cpu MHz\t\t: %lu.%03lu\n",
cpu_khz / 1000, (cpu_khz % 1000));
}
|
|
From: James S. <jsi...@us...> - 2002-05-25 20:32:32
|
Update of /cvsroot/linuxconsole/ruby/linux/arch/mips/lib In directory usw-pr-cvs1:/tmp/cvs-serv32077/linux/arch/mips/lib Modified Files: Makefile Log Message: Synced to 2.5.18 Index: Makefile =================================================================== RCS file: /cvsroot/linuxconsole/ruby/linux/arch/mips/lib/Makefile,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- Makefile 21 May 2002 04:06:05 -0000 1.7 +++ Makefile 25 May 2002 20:31:59 -0000 1.8 @@ -2,8 +2,6 @@ # Makefile for MIPS-specific library files.. # -USE_STANDARD_AS_RULE := true; - L_TARGET = lib.a EXTRA_AFLAGS := $(CFLAGS) |
|
From: James S. <jsi...@us...> - 2002-05-25 20:32:32
|
Update of /cvsroot/linuxconsole/ruby/linux/arch/mips64/lib In directory usw-pr-cvs1:/tmp/cvs-serv32077/linux/arch/mips64/lib Modified Files: Makefile Log Message: Synced to 2.5.18 Index: Makefile =================================================================== RCS file: /cvsroot/linuxconsole/ruby/linux/arch/mips64/lib/Makefile,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- Makefile 21 May 2002 04:06:05 -0000 1.4 +++ Makefile 25 May 2002 20:31:59 -0000 1.5 @@ -2,8 +2,6 @@ # Makefile for MIPS-specific library files.. # -USE_STANDARD_AS_RULE := true - EXTRA_AFLAGS := $(CFLAGS) L_TARGET = lib.a |
|
From: James S. <jsi...@us...> - 2002-05-25 20:32:31
|
Update of /cvsroot/linuxconsole/ruby/linux/Documentation/DocBook In directory usw-pr-cvs1:/tmp/cvs-serv32077/linux/Documentation/DocBook Modified Files: Makefile Log Message: Synced to 2.5.18 Index: Makefile =================================================================== RCS file: /cvsroot/linuxconsole/ruby/linux/Documentation/DocBook/Makefile,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- Makefile 1 May 2002 18:07:49 -0000 1.11 +++ Makefile 25 May 2002 20:31:58 -0000 1.12 @@ -12,17 +12,30 @@ PNG-parportbook := $(patsubst %.fig, %.png, $(IMG-parportbook)) C-procfs-example = procfs_example.sgml -books: $(BOOKS) +$(TOPDIR)/scripts/docgen: dummy + chmod 755 $(TOPDIR)/scripts/docgen -$(BOOKS): $(TOPDIR)/scripts/docproc +$(TOPDIR)/scripts/gen-all-syms: dummy + chmod 755 $(TOPDIR)/scripts/gen-all-syms -.PHONY: books ps pdf html clean mrproper +$(TOPDIR)/scripts/kernel-doc: dummy + chmod 755 $(TOPDIR)/scripts/kernel-doc -ps: $(PS) +$(TOPDIR)/scripts/docproc: dummy + $(MAKE) -C $(TOPDIR)/scripts docproc -pdf: $(PDF) +$(BOOKS): $(TOPDIR)/scripts/docgen $(TOPDIR)/scripts/gen-all-syms \ + $(TOPDIR)/scripts/kernel-doc $(TOPDIR)/scripts/docproc -html: $(HTML) +.PHONY: sgmldocs psdocs pdfdocs htmldocs clean mrproper + +sgmldocs: $(BOOKS) + +psdocs: $(PS) + +pdfdocs: $(PDF) + +htmldocs: $(HTML) %.eps: %.fig fig2dev -Leps $< $@ @@ -39,9 +52,6 @@ echo "</programlisting>" >> $@ -$(TOPDIR)/scripts/docproc: - $(MAKE) -C $(TOPDIR)/scripts docproc - mousedrivers.sgml: mousedrivers.tmpl $(TOPDIR)/scripts/docgen <$< >$@ @@ -131,7 +141,7 @@ $(TOPDIR)/lib/string.c \ $(TOPDIR)/lib/vsprintf.c \ $(TOPDIR)/net/netsyms.c - + kernel-api.sgml: kernel-api.tmpl $(APISOURCES) $(TOPDIR)/scripts/docgen $(APISOURCES) \ <kernel-api.tmpl >kernel-api.sgml |
5 messages has been excluded from this view by a project administrator.
