Menu
▾
▴
linuxdc-cvs — Shows CVS adds and commits
You can subscribe to this list here.
| 2001 |
Jan
|
Feb
(4) |
Mar
(47) |
Apr
(27) |
May
(113) |
Jun
|
Jul
|
Aug
(1) |
Sep
(15) |
Oct
(25) |
Nov
|
Dec
(34) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2002 |
Jan
(17) |
Feb
(5) |
Mar
(5) |
Apr
(2) |
May
(16) |
Jun
|
Jul
|
Aug
(15) |
Sep
(28) |
Oct
(78) |
Nov
(39) |
Dec
|
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(4) |
Jun
|
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: M. R. B. <mr...@us...> - 2002-10-29 15:20:24
|
Update of /cvsroot/linuxdc/linux-sh-dc/drivers/maple
In directory usw-pr-cvs1:/tmp/cvs-serv9028/drivers/maple
Modified Files:
Makefile maple.c
Log Message:
Linux-SH 2.5.44 switchover
Index: Makefile
===================================================================
RCS file: /cvsroot/linuxdc/linux-sh-dc/drivers/maple/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
Index: maple.c
===================================================================
RCS file: /cvsroot/linuxdc/linux-sh-dc/drivers/maple/maple.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- maple.c 1 May 2002 16:01:26 -0000 1.7
+++ maple.c 29 Oct 2002 15:20:21 -0000 1.8
@@ -8,7 +8,7 @@
#include <linux/module.h>
#include <linux/sched.h>
#include <linux/mm.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
#include <linux/timer.h>
#include <linux/init.h>
#include <linux/string.h>
@@ -17,45 +17,10 @@
#include <asm/page.h>
[...1300 lines suppressed...]
module_init(maple_init);
module_exit(maple_exit);
-MODULE_LICENSE("GPL");
-
-EXPORT_SYMBOL(maple_init_mq);
-EXPORT_SYMBOL(maple_allocq);
-EXPORT_SYMBOL(maple_freeq);
EXPORT_SYMBOL(maple_add_packet);
EXPORT_SYMBOL(maple_del_packet);
-EXPORT_SYMBOL(maple_send);
-EXPORT_SYMBOL(maple_set_gunmode);
-
EXPORT_SYMBOL(maple_register_driver);
EXPORT_SYMBOL(maple_unregister_driver);
-EXPORT_SYMBOL(maple_getcond_vblank_callback);
+EXPORT_SYMBOL(maple_getcond_callback);
/*
* Local variables:
|
|
From: M. R. B. <mr...@us...> - 2002-10-29 15:20:23
|
Update of /cvsroot/linuxdc/linux-sh-dc/drivers/char/joystick In directory usw-pr-cvs1:/tmp/cvs-serv9028/drivers/char/joystick Removed Files: Config.in Makefile maplecontrol.c purupuru.c Log Message: Linux-SH 2.5.44 switchover --- Config.in DELETED --- --- Makefile DELETED --- --- maplecontrol.c DELETED --- --- purupuru.c DELETED --- |
|
From: M. R. B. <mr...@us...> - 2002-10-29 15:20:23
|
Update of /cvsroot/linuxdc/linux-sh-dc/drivers/char
In directory usw-pr-cvs1:/tmp/cvs-serv9028/drivers/char
Modified Files:
Makefile maple_keyb.c maplemouse.c
Log Message:
Linux-SH 2.5.44 switchover
Index: Makefile
===================================================================
RCS file: /cvsroot/linuxdc/linux-sh-dc/drivers/char/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Makefile 1 May 2002 10:00:21 -0000 1.5
+++ Makefile 29 Oct 2002 15:20:20 -0000 1.6
@@ -1,142 +1,23 @@
#
# Makefile for the kernel character device drivers.
#
-# Note! Dependencies are done automagically by 'make dep', which also
-# removes any old dependencies. DON'T put your own dependencies here
-# unless it's something special (ie not a .c file).
-#
-# Note 2! The CFLAGS definitions are now inherited from the
-# parent makes..
-#
#
# This file contains the font map for the default (hardware) font
#
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
+obj-y += mem.o tty_io.o n_tty.o tty_ioctl.o pty.o misc.o random.o
# All of the (potential) objects that export symbols.
# This list comes from 'grep -l EXPORT_SYMBOL *.[hc]'.
-export-objs := busmouse.o console.o keyboard.o sysrq.o \
- misc.o pty.o random.o selection.o serial.o \
- sonypi.o tty_io.o tty_ioctl.o generic_serial.o
-
-mod-subdirs := joystick ftape drm pcmcia
-
-list-multi :=
-
-KEYMAP =defkeymap.o
-KEYBD =pc_keyb.o
-CONSOLE =console.o
-SERIAL =serial.o
-
-ifeq ($(ARCH),s390)
- KEYMAP =
- KEYBD =
- CONSOLE =
- SERIAL =
-endif
-
-ifeq ($(ARCH),mips)
- ifneq ($(CONFIG_PC_KEYB),y)
- KEYBD =
- endif
-endif
-
-ifeq ($(ARCH),s390x)
- KEYMAP =
- KEYBD =
- CONSOLE =
- SERIAL =
-endif
-
-ifeq ($(ARCH),m68k)
- ifdef CONFIG_AMIGA
- KEYBD = amikeyb.o
- else
- KEYBD =
- endif
- SERIAL =
-endif
-
-ifeq ($(ARCH),arm)
- ifneq ($(CONFIG_PC_KEYMAP),y)
- KEYMAP =
- endif
- ifneq ($(CONFIG_PC_KEYB),y)
- KEYBD =
- endif
-endif
-
-ifeq ($(ARCH),sh)
- KEYMAP =
- KEYBD =
- CONSOLE =
- ifeq ($(CONFIG_SH_HP600),y)
- KEYMAP = defkeymap.o
- KEYBD = scan_keyb.o hp600_keyb.o
- CONSOLE = console.o
- endif
- ifeq ($(CONFIG_SH_DMIDA),y)
- # DMIDA does not connect the HD64465 PS/2 keyboard port
- # but we allow for USB keyboards to be plugged in.
- KEYMAP = defkeymap.o
- KEYBD = # hd64465_keyb.o pc_keyb.o
- CONSOLE = console.o
- endif
- ifeq ($(CONFIG_SH_EC3104),y)
- KEYMAP = defkeymap.o
- KEYBD = ec3104_keyb.o
- CONSOLE = console.o
- endif
- ifeq ($(CONFIG_SH_DREAMCAST),y)
- KEYMAP = defkeymap.o
- KEYBD = dc_keyb.o
- CONSOLE = console.o
- endif
-endif
-
-ifeq ($(CONFIG_DECSTATION),y)
- KEYMAP =
- KEYBD =
- SERIAL = decserial.o
-endif
-
-ifeq ($(CONFIG_BAGET_MIPS),y)
- KEYBD =
- SERIAL =
-endif
-
-ifeq ($(CONFIG_NINO),y)
- SERIAL =
-endif
-
-ifneq ($(CONFIG_SUN_SERIAL),)
- SERIAL =
-endif
-
-ifeq ($(CONFIG_QTRONIX_KEYBOARD),y)
- KEYBD = qtronix.o
- KEYMAP = qtronixmap.o
-endif
-
-obj-$(CONFIG_VT) += vt.o vc_screen.o consolemap.o consolemap_deftbl.o $(CONSOLE) selection.o
-obj-$(CONFIG_SERIAL) += $(SERIAL)
-obj-$(CONFIG_SERIAL_ACPI) += acpi_serial.o
-obj-$(CONFIG_SERIAL_21285) += serial_21285.o
-obj-$(CONFIG_SERIAL_SA1100) += serial_sa1100.o
-obj-$(CONFIG_SERIAL_AMBA) += serial_amba.o
-
-ifndef CONFIG_SUN_KEYBOARD
- obj-$(CONFIG_VT) += keyboard.o $(KEYMAP) $(KEYBD)
-else
- obj-$(CONFIG_PCI) += keyboard.o $(KEYMAP)
-endif
+export-objs := busmouse.o vt.o generic_serial.o ip2main.o \
+ ite_gpio.o keyboard.o misc.o nvram.o random.o rtc.o \
+ selection.o sonypi.o sysrq.o tty_io.o tty_ioctl.o
+obj-$(CONFIG_VT) += vt_ioctl.o vc_screen.o consolemap.o consolemap_deftbl.o selection.o keyboard.o
+obj-$(CONFIG_HW_CONSOLE) += vt.o defkeymap.o
obj-$(CONFIG_MAGIC_SYSRQ) += sysrq.o
obj-$(CONFIG_ATARI_DSP56K) += dsp56k.o
obj-$(CONFIG_ROCKETPORT) += rocket.o
@@ -152,46 +33,36 @@
obj-$(CONFIG_ISI) += isicom.o
obj-$(CONFIG_ESPSERIAL) += esp.o
obj-$(CONFIG_SYNCLINK) += synclink.o
+obj-$(CONFIG_SYNCLINKMP) += synclinkmp.o
obj-$(CONFIG_N_HDLC) += n_hdlc.o
obj-$(CONFIG_SPECIALIX) += specialix.o
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) += rio/rio.o generic_serial.o
+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
obj-$(CONFIG_MVME162_SCC) += generic_serial.o vme_scc.o
obj-$(CONFIG_BVME6000_SCC) += generic_serial.o vme_scc.o
obj-$(CONFIG_SERIAL_TX3912) += generic_serial.o serial_tx3912.o
+obj-$(CONFIG_HVC_CONSOLE) += hvc_console.o
+obj-$(CONFIG_RAW_DRIVER) += raw.o
-subdir-$(CONFIG_RIO) += rio
-subdir-$(CONFIG_INPUT) += joystick
-
-obj-$(CONFIG_ATIXL_BUSMOUSE) += atixlmouse.o
-obj-$(CONFIG_LOGIBUSMOUSE) += logibusmouse.o
obj-$(CONFIG_PRINTER) += lp.o
-
-ifeq ($(CONFIG_INPUT),y)
-obj-y += joystick/js.o
-endif
+obj-$(CONFIG_TIPAR) += tipar.o
obj-$(CONFIG_MAPLE_KEYBOARD) += maple_keyb.o
obj-$(CONFIG_MAPLE_MOUSE) += maplemouse.o
-obj-$(CONFIG_MAPLE_LIGHTGUN) += maple_lg.o
obj-$(CONFIG_BUSMOUSE) += busmouse.o
obj-$(CONFIG_DTLK) += dtlk.o
obj-$(CONFIG_R3964) += n_r3964.o
obj-$(CONFIG_APPLICOM) += applicom.o
obj-$(CONFIG_SONYPI) += sonypi.o
-obj-$(CONFIG_MS_BUSMOUSE) += msbusmouse.o
-obj-$(CONFIG_82C710_MOUSE) += qpmouse.o
-obj-$(CONFIG_AMIGAMOUSE) += amigamouse.o
obj-$(CONFIG_ATARIMOUSE) += atarimouse.o
-obj-$(CONFIG_ADBMOUSE) += adbmouse.o
-obj-$(CONFIG_PC110_PAD) += pc110pad.o
obj-$(CONFIG_RTC) += rtc.o
+obj-$(CONFIG_GEN_RTC) += genrtc.o
obj-$(CONFIG_EFI_RTC) += efirtc.o
ifeq ($(CONFIG_PPC),)
obj-$(CONFIG_NVRAM) += nvram.o
@@ -200,24 +71,15 @@
obj-$(CONFIG_I8K) += i8k.o
obj-$(CONFIG_DS1620) += ds1620.o
obj-$(CONFIG_INTEL_RNG) += i810_rng.o
-
+obj-$(CONFIG_AMD_RNG) += amd768_rng.o
obj-$(CONFIG_QIC02_TAPE) += tpqic02.o
-
-subdir-$(CONFIG_FTAPE) += ftape
-subdir-$(CONFIG_DRM_OLD) += drm-4.0
-subdir-$(CONFIG_DRM_NEW) += drm
-subdir-$(CONFIG_PCMCIA) += pcmcia
-subdir-$(CONFIG_AGP) += agp
-
-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
obj-$(CONFIG_NWBUTTON) += nwbutton.o
obj-$(CONFIG_NWFLASH) += nwflash.o
+obj-$(CONFIG_SCx200_GPIO) += scx200_gpio.o
# Only one watchdog can succeed. We probe the hardware watchdog
# drivers first, then the softdog driver. This means if your hardware
@@ -229,6 +91,7 @@
obj-$(CONFIG_ADVANTECH_WDT) += advantechwdt.o
obj-$(CONFIG_IB700_WDT) += ib700wdt.o
obj-$(CONFIG_MIXCOMWD) += mixcomwd.o
+obj-$(CONFIG_SCx200_WDT) += scx200_wdt.o
obj-$(CONFIG_60XX_WDT) += sbc60xxwdt.o
obj-$(CONFIG_WDT) += wdt.o
obj-$(CONFIG_WDTPCI) += wdt_pci.o
@@ -239,28 +102,33 @@
obj-$(CONFIG_SH_WDT) += shwdt.o
obj-$(CONFIG_EUROTECH_WDT) += eurotechwdt.o
obj-$(CONFIG_SOFT_WATCHDOG) += softdog.o
+obj-$(CONFIG_MWAVE) += mwave/
+obj-$(CONFIG_AGP) += agp/
+obj-$(CONFIG_DRM) += drm/
+obj-$(CONFIG_PCMCIA) += pcmcia/
-subdir-$(CONFIG_MWAVE) += mwave
-ifeq ($(CONFIG_MWAVE),y)
- obj-y += mwave/mwave.o
-endif
+# Files generated that shall be removed upon make clean
+clean-files := consolemap_deftbl.c defkeymap.c qtronixmap.c
include $(TOPDIR)/Rules.make
-fastdep:
+$(obj)/consolemap_deftbl.c: $(src)/$(FONTMAPFILE)
+ $(call do_cmd,CONMK $(echo_target),$(objtree)/scripts/conmakehash $< > $@)
-conmakehash: conmakehash.c
- $(HOSTCC) $(HOSTCFLAGS) -o conmakehash conmakehash.c
+$(obj)/defkeymap.o: $(obj)/defkeymap.c
-consolemap_deftbl.c: $(FONTMAPFILE) conmakehash
- ./conmakehash $(FONTMAPFILE) > consolemap_deftbl.c
+$(obj)/qtronixmap.o: $(obj)/qtronixmap.c
-consolemap_deftbl.o: consolemap_deftbl.c $(TOPDIR)/include/linux/types.h
+# Uncomment if you're changing the keymap and have an appropriate
+# loadkeys version for the map. By default, we'll use the shipped
+# versions.
+# GENERATE_KEYMAP := 1
-.DELETE_ON_ERROR:
+ifdef GENERATE_KEYMAP
-defkeymap.c: defkeymap.map
- set -e ; loadkeys --mktable $< | sed -e 's/^static *//' > $@
+$(obj)/defkeymap.c $(obj)/qtronixmap.c: $(obj)/%.c: $(src)/%.map
+ loadkeys --mktable $< > $@.tmp
+ sed -e 's/^static *//' $@.tmp > $@
+ rm $@.tmp
-qtronixmap.c: qtronixmap.map
- set -e ; loadkeys --mktable $< | sed -e 's/^static *//' > $@
+endif
Index: maple_keyb.c
===================================================================
RCS file: /cvsroot/linuxdc/linux-sh-dc/drivers/char/maple_keyb.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- maple_keyb.c 23 Jan 2002 06:56:48 -0000 1.2
+++ maple_keyb.c 29 Oct 2002 15:20:20 -0000 1.3
@@ -5,7 +5,7 @@
*/
#include <linux/kernel.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
#include <linux/input.h>
#include <linux/module.h>
#include <linux/init.h>
@@ -80,14 +80,16 @@
}
-static void dc_kbd_callback(struct maple_driver_data *data)
+static void dc_kbd_callback(struct mapleq *mq)
{
- struct mapleq *mq=& data->mq;
- struct dc_kbd *kbd = data->private_data;
- unsigned long *buf = (unsigned long *)mq->recvbuf;
+ struct maple_device *mapledev = mq->dev;
+ struct dc_kbd *kbd = mapledev->private_data;
+ unsigned long *buf = mq->recvbuf;
+ if (buf[1] == mapledev->function) {
memcpy(kbd->new, buf+2, 8);
dc_scan_kbd(kbd);
+ }
}
@@ -106,17 +108,17 @@
}
-static int dc_kbd_connect(struct maple_driver_data *d)
+static int dc_kbd_connect(struct maple_device *dev)
{
int i;
- unsigned long data = d->function_data;
+ unsigned long data = be32_to_cpu(dev->devinfo.function_data[0]);
struct dc_kbd *kbd;
if (!(kbd = kmalloc(sizeof(struct dc_kbd), GFP_KERNEL)))
return -1;
memset(kbd, 0, sizeof(struct dc_kbd));
- d->private_data = kbd;
+ dev->private_data = kbd;
kbd->dev.evbit[0] = BIT(EV_KEY) | BIT(EV_REP);
@@ -129,13 +131,14 @@
kbd->dev.close = dc_kbd_close;
kbd->dev.event = NULL;
- kbd->dev.name = d->dev->product_name;
- kbd->dev.idbus = BUS_MAPLE;
+ kbd->dev.name = dev->product_name;
+ kbd->dev.id.bustype = BUS_MAPLE;
input_register_device(&kbd->dev);
- printk(KERN_INFO "input%d: keyboard(0x%lx): %s\n",
- kbd->dev.number, data, kbd->dev.name);
+ maple_getcond_callback(dev, dc_kbd_callback, 1, MAPLE_FUNC_KEYBOARD);
+
+ printk(KERN_INFO "input: keyboard(0x%lx): %s\n", data, kbd->dev.name);
MOD_INC_USE_COUNT;
@@ -143,9 +146,9 @@
}
-static void dc_kbd_disconnect(struct maple_driver_data *d)
+static void dc_kbd_disconnect(struct maple_device *dev)
{
- struct dc_kbd *kbd = d->private_data;
+ struct dc_kbd *kbd = dev->private_data;
input_unregister_device(&kbd->dev);
@@ -160,8 +163,6 @@
name: "Dreamcast keyboard",
connect: dc_kbd_connect,
disconnect: dc_kbd_disconnect,
- reply: dc_kbd_callback,
- vblank: maple_getcond_vblank_callback,
};
Index: maplemouse.c
===================================================================
RCS file: /cvsroot/linuxdc/linux-sh-dc/drivers/char/maplemouse.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- maplemouse.c 23 Jan 2002 06:56:48 -0000 1.2
+++ maplemouse.c 29 Oct 2002 15:20:20 -0000 1.3
@@ -5,7 +5,7 @@
*/
#include <linux/kernel.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
#include <linux/input.h>
#include <linux/module.h>
#include <linux/init.h>
@@ -21,11 +21,11 @@
};
-static void dc_mouse_callback(struct maple_driver_data *data)
+static void dc_mouse_callback(struct mapleq *mq)
{
int buttons, relx, rely, relz;
- struct mapleq *mq=& data->mq;
- struct dc_mouse *mouse = data->private_data;
+ struct maple_device *mapledev = mq->dev;
+ struct dc_mouse *mouse = mapledev->private_data;
struct input_dev *dev = &mouse->dev;
unsigned char *res = mq->recvbuf;
@@ -58,16 +58,16 @@
}
-static int dc_mouse_connect(struct maple_driver_data *d)
+static int dc_mouse_connect(struct maple_device *dev)
{
- unsigned long data = d->function_data;
+ unsigned long data = be32_to_cpu(dev->devinfo.function_data[0]);
struct dc_mouse *mouse;
if (!(mouse = kmalloc(sizeof(struct dc_mouse), GFP_KERNEL)))
return -1;
memset(mouse, 0, sizeof(struct dc_mouse));
- d->private_data = mouse;
+ dev->private_data = mouse;
mouse->dev.evbit[0] = BIT(EV_KEY) | BIT(EV_REL);
mouse->dev.keybit[LONG(BTN_MOUSE)] = BIT(BTN_LEFT) | BIT(BTN_RIGHT) | BIT(BTN_MIDDLE);
@@ -78,11 +78,13 @@
mouse->dev.close = dc_mouse_close;
mouse->dev.event = NULL;
- mouse->dev.name = d->dev->product_name;
+ mouse->dev.name = dev->product_name;
mouse->dev.idbus = BUS_MAPLE;
input_register_device(&mouse->dev);
+ maple_getcond_callback(dev, dc_mouse_callback, 1, MAPLE_FUNC_MOUSE);
+
printk(KERN_INFO "input%d: mouse(0x%lx): %s\n",
mouse->dev.number, data, mouse->dev.name);
@@ -92,9 +94,9 @@
}
-static void dc_mouse_disconnect(struct maple_driver_data *d)
+static void dc_mouse_disconnect(struct maple_device *dev)
{
- struct dc_mouse *mouse = d->private_data;
+ struct dc_mouse *mouse = dev->private_data;
input_unregister_device(&mouse->dev);
@@ -109,8 +111,6 @@
name: "Dreamcast mouse",
connect: dc_mouse_connect,
disconnect: dc_mouse_disconnect,
- reply: dc_mouse_callback,
- vblank: maple_getcond_vblank_callback,
};
|
|
From: M. R. B. <mr...@us...> - 2002-10-29 15:20:23
|
Update of /cvsroot/linuxdc/linux-sh-dc/drivers/cdrom
In directory usw-pr-cvs1:/tmp/cvs-serv9028/drivers/cdrom
Modified Files:
gdrom.c
Log Message:
Linux-SH 2.5.44 switchover
Index: gdrom.c
===================================================================
RCS file: /cvsroot/linuxdc/linux-sh-dc/drivers/cdrom/gdrom.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- gdrom.c 17 Dec 2001 04:43:48 -0000 1.2
+++ gdrom.c 29 Oct 2002 15:20:20 -0000 1.3
@@ -30,7 +30,7 @@
#define DEVICE_NAME "GD-ROM"
#define DEVICE_REQUEST do_gdrom_request
-#define DEVICE_NR(device) (MINOR(device))
+#define DEVICE_NR(device) (minor(device))
#define DEVICE_STR "gdrom"
#include <linux/blk.h>
@@ -486,7 +486,7 @@
hardsect_size[MAJOR_NR] = &gdrom_hardsecsize;
read_ahead[MAJOR_NR] = 4;
- gdrom_info.dev = MKDEV(MAJOR_NR,0);
+ gdrom_info.dev = mk_kdev(MAJOR_NR,0);
if (register_cdrom(&gdrom_info) != 0) {
printk(KERN_ERR "Cannot register SEGA GD-ROM!\n");
free_irq(GDROM_IRQ, NULL);
|
|
From: M. R. B. <mr...@us...> - 2002-10-29 15:20:22
|
Update of /cvsroot/linuxdc/linux-sh-dc/arch/sh/kernel In directory usw-pr-cvs1:/tmp/cvs-serv9028/arch/sh/kernel Removed Files: io_dc.c pci-dc.c setup_dc.c Log Message: Linux-SH 2.5.44 switchover --- io_dc.c DELETED --- --- pci-dc.c DELETED --- --- setup_dc.c DELETED --- |
|
From: M. R. B. <mr...@us...> - 2002-10-29 15:20:22
|
Update of /cvsroot/linuxdc/linux-sh-dc/Documentation In directory usw-pr-cvs1:/tmp/cvs-serv9028/Documentation Removed Files: Configure.help Log Message: Linux-SH 2.5.44 switchover --- Configure.help DELETED --- |
|
From: M. R. B. <mr...@us...> - 2002-10-26 14:18:31
|
Update of /cvsroot/linuxdc/linux-sh-dc/Documentation
In directory usw-pr-cvs1:/tmp/cvs-serv20342/Documentation
Modified Files:
Tag: linux-sh-dc-2_4-branch
Configure.help
Log Message:
Fix merge breakage
Index: Configure.help
===================================================================
RCS file: /cvsroot/linuxdc/linux-sh-dc/Documentation/Configure.help,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -u -d -r1.5.2.1 -r1.5.2.2
--- Configure.help 26 Oct 2002 14:14:00 -0000 1.5.2.1
+++ Configure.help 26 Oct 2002 14:18:27 -0000 1.5.2.2
@@ -4752,6 +4752,14 @@
"I2C support" and "I2C bit-banging support" in the character devices
section, and then to "Matrox I2C support" and "G400 second head
support" here in the framebuffer section.
+
+ If you have G550, you must also compile support for G450/G550 secondary
+ head into kernel, otherwise picture will be shown only on the output you
+ are probably not using...
+
+ If you have G550, you must also compile support for G450/G550 secondary
+ head into kernel, otherwise picture will be shown only on the output you
+ are probably not using...
If you have G550, you must also compile support for G450/G550 secondary
head into kernel, otherwise picture will be shown only on the output you
@@ -14373,7 +14381,7 @@
If your particular adapter is not in the list and you are _sure_ it
is Pegasus or Pegasus-II based then send me (pma...@us...)
vendor and device IDs.
-
+
This code is also available as a module ( = code which can be
inserted in and removed from the running kernel whenever you want).
The module will be called pegasus.o. If you want to compile it as a
@@ -14401,6 +14409,28 @@
The module will be called rtl8150.o. If you want to compile it as a
module, say M here and read <file:Documentation/modules.txt>.
+Realtek RTL8150 based USB-Ethernet device support
+CONFIG_USB_RTL8150
+ Say Y here if you have RTL8150 based usb-ethernet adapter.
+ Send me (pe...@us...) any comments you may have.
+ You can also check for updates at <http://pegasus2.sourceforge.net/>
+
+ This code is also available as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want).
+ The module will be called rtl8150.o. If you want to compile it as a
+ module, say M here and read <file:Documentation/modules.txt>.
+
+Realtek RTL8150 based USB-Ethernet device support
+CONFIG_USB_RTL8150
+ Say Y here if you have RTL8150 based usb-ethernet adapter.
+ Send me (pe...@us...) any comments you may have.
+ You can also check for updates at http://pegasus2.sourceforge.net/
+
+ This code is also available as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want).
+ The module will be called rtl8150.o. If you want to compile it as a
+ module, say M here and read <file:Documentation/modules.txt>.
+
USB KLSI KL5USB101-based Ethernet device support
CONFIG_USB_KAWETH
Say Y here if you want to use one of the following 10Mbps only
@@ -18798,7 +18828,7 @@
inserted in and removed from the running kernel whenever you want).
The module is called shwdt.o. If you want to compile it as a module,
say M here and read Documentation/modules.txt.
-
+
Wafer 5823 Watchdog
CONFIG_WAFER_WDT
This is a driver for the hardware watchdog on the ICP Wafer 5823
@@ -24579,6 +24609,54 @@
and read <file:Documentation/modules.txt>. The module will be
called old_belkin.o. Some information is contained in the comments
at the top of <file:drivers/net/irda/old_belkin.c>.
+
+ACTiSYS IR-200L dongle (Experimental)
+CONFIG_ACT200L_DONGLE
+ Say Y here if you want to build support for the ACTiSYS IR-200L
+ dongle. If you want to compile it as a module, say M here and read
+ Documentation/modules.txt. The ACTiSYS IR-200L dongle attaches to
+ the normal 9-pin serial port connector, and can currently only be
+ used by IrTTY. To activate support for ACTiSYS IR-200L dongles
+ you will have to start irattach like this: "irattach -d act200l".
+
+Mobile Action MA600 dongle (Experimental)
+CONFIG_MA600_DONGLE
+ Say Y here if you want to build support for the Mobile Action MA600
+ dongle. If you want to compile it as a module, say M here and read
+ <file:Documentation/modules.txt>. The MA600 dongle attaches to
+ the normal 9-pin serial port connector, and can currently only be
+ tested on IrCOMM. To activate support for MA600 dongles you will
+ have to insert "irattach -d ma600" in the /etc/irda/drivers script.
+ Note: irutils 0.9.15 requires no modification. irutils 0.9.9 needs
+ modification. For more information, download the following tar gzip
+ file.
+
+ There is a pre-compiled module on
+ <http://engsvr.ust.hk/~eetwl95/download/ma600-2.4.x.tar.gz>
+
+ACTiSYS IR-200L dongle (Experimental)
+CONFIG_ACT200L_DONGLE
+ Say Y here if you want to build support for the ACTiSYS IR-200L
+ dongle. If you want to compile it as a module, say M here and read
+ Documentation/modules.txt. The ACTiSYS IR-200L dongle attaches to
+ the normal 9-pin serial port connector, and can currently only be
+ used by IrTTY. To activate support for ACTiSYS IR-200L dongles
+ you will have to start irattach like this: "irattach -d act200l".
+
+Mobile Action MA600 dongle (Experimental)
+CONFIG_MA600_DONGLE
+ Say Y here if you want to build support for the Mobile Action MA600
+ dongle. If you want to compile it as a module, say M here and read
+ <file:Documentation/modules.txt>. The MA600 dongle attaches to
+ the normal 9-pin serial port connector, and can currently only be
+ tested on IrCOMM. To activate support for MA600 dongles you will
+ have to insert "irattach -d ma600" in the /etc/irda/drivers script.
+ Note: irutils 0.9.15 requires no modification. irutils 0.9.9 needs
+ modification. For more information, download the following tar gzip
+ file.
+
+ There is a pre-compiled module on
+ <http://engsvr.ust.hk/~eetwl95/download/ma600-2.4.x.tar.gz>
ACTiSYS IR-200L dongle (Experimental)
CONFIG_ACT200L_DONGLE
|
|
From: M. R. B. <mr...@us...> - 2002-10-26 14:18:31
|
Update of /cvsroot/linuxdc/linux-sh-dc/drivers/sound
In directory usw-pr-cvs1:/tmp/cvs-serv20342/drivers/sound
Modified Files:
Tag: linux-sh-dc-2_4-branch
Config.in
Log Message:
Fix merge breakage
Index: Config.in
===================================================================
RCS file: /cvsroot/linuxdc/linux-sh-dc/drivers/sound/Config.in,v
retrieving revision 1.2.4.2
retrieving revision 1.2.4.3
diff -u -d -r1.2.4.2 -r1.2.4.3
--- Config.in 26 Oct 2002 14:14:01 -0000 1.2.4.2
+++ Config.in 26 Oct 2002 14:18:28 -0000 1.2.4.3
@@ -216,7 +216,7 @@
bool ' Audio Excel DSP 16 (MPU401 emulation)' CONFIG_AEDSP16_MPU401
fi
fi
-
+
if [ "$CONFIG_ARM" = "y" ]; then
if [ "$CONFIG_ARCH_ACORN" = "y" -o "$CONFIG_ARCH_CLPS7500" = "y" ]; then
dep_tristate ' VIDC 16-bit sound' CONFIG_SOUND_VIDC $CONFIG_SOUND_OSS
|
|
From: M. R. B. <mr...@us...> - 2002-10-26 14:18:29
|
Update of /cvsroot/linuxdc/linux-sh-dc
In directory usw-pr-cvs1:/tmp/cvs-serv20342
Modified Files:
Tag: linux-sh-dc-2_4-branch
ChangeLog.dc
Log Message:
Fix merge breakage
Index: ChangeLog.dc
===================================================================
RCS file: /cvsroot/linuxdc/linux-sh-dc/ChangeLog.dc,v
retrieving revision 1.56.2.2
retrieving revision 1.56.2.3
diff -u -d -r1.56.2.2 -r1.56.2.3
--- ChangeLog.dc 26 Oct 2002 14:14:00 -0000 1.56.2.2
+++ ChangeLog.dc 26 Oct 2002 14:18:26 -0000 1.56.2.3
@@ -1,5 +1,8 @@
2002-10-26 M. R. Brown <mr...@li...>
+ * Documentation/Configure.help, drivers/sound/Config.in: Fix merge
+ breakage.
+
Linux-SH 2.4.20-pre11
* AGAINST-2.4.20-pre11: New file.
|
|
From: M. R. B. <mr...@us...> - 2002-10-26 14:14:04
|
Update of /cvsroot/linuxdc/linux-sh-dc/Documentation
In directory usw-pr-cvs1:/tmp/cvs-serv18863/Documentation
Modified Files:
Tag: linux-sh-dc-2_4-branch
Configure.help
Log Message:
Linux-SH 2.4.20-pre11
Index: Configure.help
===================================================================
RCS file: /cvsroot/linuxdc/linux-sh-dc/Documentation/Configure.help,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -d -r1.5 -r1.5.2.1
--- Configure.help 1 May 2002 10:00:19 -0000 1.5
+++ Configure.help 26 Oct 2002 14:14:00 -0000 1.5.2.1
@@ -2,10 +2,7 @@
# Eric S. Raymond <mailto:es...@th...>
# Steven Cole <mailto:ele...@me...>
#
-# Merged version 2.69: current with 2.4.17-pre8/2.5.1-pre10.
-#
-# This version of the Linux kernel configuration help texts
-# corresponds to kernel versions 2.4.x and 2.5.x.
+# Version 3.01: current with 2.4.19+
#
# Translations of this file available on the WWW:
#
[...6124 lines suppressed...]
+ Say Y here to support tuning the ITE8172's IDE interface. This makes
+ it possible to set DMA channel or PIO opration and the transfer rate.
+
+Enable protocol mode for the L1 console
+CONFIG_SERIAL_SGI_L1_PROTOCOL
+ Uses protocol mode instead of raw mode for the level 1 console on the
+ SGI SN (Scalable NUMA) platform for IA64. If you are compiling for
+ an SGI SN box then Y is the recommended value, otherwise say N.
+
+New bus configuration (EXPERIMENTAL)
+CONFIG_TULIP_MWI
+ This configures your Tulip card specifically for the card and
+ system cache line size type you are using.
+
+ This is experimental code, not yet tested on many boards.
+
+ If unsure, say N.
#
# A couple of things I keep forgetting:
|
|
From: M. R. B. <mr...@us...> - 2002-10-26 14:14:04
|
Update of /cvsroot/linuxdc/linux-sh-dc/drivers/mtd/maps
In directory usw-pr-cvs1:/tmp/cvs-serv18863/drivers/mtd/maps
Modified Files:
Tag: linux-sh-dc-2_4-branch
Config.in Makefile
Log Message:
Linux-SH 2.4.20-pre11
Index: Config.in
===================================================================
RCS file: /cvsroot/linuxdc/linux-sh-dc/drivers/mtd/maps/Config.in,v
retrieving revision 1.3
retrieving revision 1.3.4.1
diff -u -d -r1.3 -r1.3.4.1
--- Config.in 17 Dec 2001 04:43:48 -0000 1.3
+++ Config.in 26 Oct 2002 14:14:01 -0000 1.3.4.1
@@ -38,6 +38,14 @@
fi
if [ "$CONFIG_MIPS" = "y" ]; then
+ dep_tristate ' Pb1000 boot flash device' CONFIG_MTD_PB1000 $CONFIG_MIPS_PB1000
+ dep_tristate ' Pb1500 MTD support' CONFIG_MTD_PB1500 $CONFIG_MIPS_PB1500
+ dep_tristate ' Pb1100 MTD support' CONFIG_MTD_PB1100 $CONFIG_MIPS_PB1100
+ if [ "$CONFIG_MTD_PB1500" = "y" -o "$CONFIG_MTD_PB1500" = "m" \
+ -o "$CONFIG_MTD_PB1100" = "y" -o "$CONFIG_MTD_PB1100" = "m" ]; then
+ bool ' Pb1[015]00 boot flash device' CONFIG_MTD_PB1500_BOOT
+ bool ' Pb1[015]00 user flash device (2nd 32MB bank)' CONFIG_MTD_PB1500_USER
+ fi
dep_tristate ' Flash chip mapping on ITE QED-4N-S01B, Globespan IVR or custom board' CONFIG_MTD_CSTM_MIPS_IXX $CONFIG_MTD_CFI $CONFIG_MTD_JEDEC $CONFIG_MTD_PARTITIONS
if [ "$CONFIG_MTD_CSTM_MIPS_IXX" = "y" -o "$CONFIG_MTD_CSTM_MIPS_IXX" = "m" ]; then
hex ' Physical start address of flash mapping' CONFIG_MTD_CSTM_MIPS_IXX_START 0x8000000
Index: Makefile
===================================================================
RCS file: /cvsroot/linuxdc/linux-sh-dc/drivers/mtd/maps/Makefile,v
retrieving revision 1.3.4.1
retrieving revision 1.3.4.2
diff -u -d -r1.3.4.1 -r1.3.4.2
--- Makefile 26 Oct 2002 12:36:12 -0000 1.3.4.1
+++ Makefile 26 Oct 2002 14:14:01 -0000 1.3.4.2
@@ -37,6 +37,7 @@
obj-$(CONFIG_MTD_SOLUTIONENGINE)+= solutionengine.o
obj-$(CONFIG_MTD_PCI) += pci.o
obj-$(CONFIG_MTD_PB1000) += pb1xxx-flash.o
+obj-$(CONFIG_MTD_PB1100) += pb1xxx-flash.o
obj-$(CONFIG_MTD_PB1500) += pb1xxx-flash.o
obj-$(CONFIG_MTD_AUTCPU12) += autcpu12-nvram.o
obj-$(CONFIG_MTD_VMU) += vmu-flash.o
|
|
From: M. R. B. <mr...@us...> - 2002-10-26 14:14:04
|
Update of /cvsroot/linuxdc/linux-sh-dc/drivers/sound
In directory usw-pr-cvs1:/tmp/cvs-serv18863/drivers/sound
Modified Files:
Tag: linux-sh-dc-2_4-branch
Config.in
Log Message:
Linux-SH 2.4.20-pre11
Index: Config.in
===================================================================
RCS file: /cvsroot/linuxdc/linux-sh-dc/drivers/sound/Config.in,v
retrieving revision 1.2.4.1
retrieving revision 1.2.4.2
diff -u -d -r1.2.4.1 -r1.2.4.2
--- Config.in 26 Oct 2002 12:36:12 -0000 1.2.4.1
+++ Config.in 26 Oct 2002 14:14:01 -0000 1.2.4.2
@@ -6,6 +6,7 @@
# Prompt user for primary drivers.
+dep_tristate ' ALi5455 audio support' CONFIG_SOUND_ALI5455 $CONFIG_SOUND $CONFIG_PCI
dep_tristate ' BT878 audio dma' CONFIG_SOUND_BT878 $CONFIG_SOUND $CONFIG_PCI
dep_tristate ' C-Media PCI (CMI8338/8738)' CONFIG_SOUND_CMPCI $CONFIG_SOUND $CONFIG_PCI
if [ "$CONFIG_SOUND_CMPCI" = "y" -o "$CONFIG_SOUND_CMPCI" = "m" ]; then
@@ -42,7 +43,11 @@
dep_tristate ' ESS Technology Solo1' CONFIG_SOUND_ESSSOLO1 $CONFIG_SOUND $CONFIG_PCI
dep_tristate ' ESS Maestro, Maestro2, Maestro2E driver' CONFIG_SOUND_MAESTRO $CONFIG_SOUND $CONFIG_PCI
dep_tristate ' ESS Maestro3/Allegro driver (EXPERIMENTAL)' CONFIG_SOUND_MAESTRO3 $CONFIG_SOUND $CONFIG_PCI $CONFIG_EXPERIMENTAL
-dep_tristate ' Intel ICH (i8xx), SiS 7012, NVidia nForce Audio or AMD 768' CONFIG_SOUND_ICH $CONFIG_PCI
+dep_tristate ' ForteMedia FM801 driver (EXPERIMENTAL)' CONFIG_SOUND_FORTE $CONFIG_SOUND $CONFIG_PCI $CONFIG_EXPERIMENTAL
+dep_tristate ' Intel ICH (i8xx), SiS 7012, NVidia nForce Audio or AMD 768/811x' CONFIG_SOUND_ICH $CONFIG_PCI
+if [ "$CONFIG_GSC_LASI" = "y" ]; then
+ dep_tristate ' PA Harmony audio driver' CONFIG_SOUND_HARMONY $CONFIG_SOUND
+fi
if [ "$CONFIG_MIPS_ITE8172" = "y" -o "$CONFIG_MIPS_IVR" = "y" ]; then
dep_tristate ' IT8172G Sound' CONFIG_SOUND_IT8172 $CONFIG_SOUND
fi
|
|
From: M. R. B. <mr...@us...> - 2002-10-26 14:14:04
|
Update of /cvsroot/linuxdc/linux-sh-dc/drivers/char
In directory usw-pr-cvs1:/tmp/cvs-serv18863/drivers/char
Modified Files:
Tag: linux-sh-dc-2_4-branch
Makefile
Log Message:
Linux-SH 2.4.20-pre11
Index: Makefile
===================================================================
RCS file: /cvsroot/linuxdc/linux-sh-dc/drivers/char/Makefile,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -d -r1.5 -r1.5.2.1
--- Makefile 1 May 2002 10:00:21 -0000 1.5
+++ Makefile 26 Oct 2002 14:14:01 -0000 1.5.2.1
@@ -23,7 +23,8 @@
export-objs := busmouse.o console.o keyboard.o sysrq.o \
misc.o pty.o random.o selection.o serial.o \
- sonypi.o tty_io.o tty_ioctl.o generic_serial.o
+ sonypi.o tty_io.o tty_ioctl.o generic_serial.o \
+ au1000_gpio.o hp_psaux.o nvram.o
mod-subdirs := joystick ftape drm pcmcia
@@ -63,6 +64,21 @@
SERIAL =
endif
+ifdef CONFIG_APOLLO
+ KEYBD += dn_keyb.o
+endif
+
+ifeq ($(ARCH),parisc)
+ ifdef CONFIG_GSC_PS2
+ KEYBD = hp_psaux.o hp_keyb.o
+ else
+ KEYBD =
+ endif
+ ifdef CONFIG_PDC_CONSOLE
+ CONSOLE += pdc_console.o
+ endif
+endif
+
ifeq ($(ARCH),arm)
ifneq ($(CONFIG_PC_KEYMAP),y)
KEYMAP =
@@ -137,6 +153,7 @@
obj-$(CONFIG_PCI) += keyboard.o $(KEYMAP)
endif
+obj-$(CONFIG_HIL) += hp_keyb.o
obj-$(CONFIG_MAGIC_SYSRQ) += sysrq.o
obj-$(CONFIG_ATARI_DSP56K) += dsp56k.o
obj-$(CONFIG_ROCKETPORT) += rocket.o
@@ -152,6 +169,7 @@
obj-$(CONFIG_ISI) += isicom.o
obj-$(CONFIG_ESPSERIAL) += esp.o
obj-$(CONFIG_SYNCLINK) += synclink.o
+obj-$(CONFIG_SYNCLINKMP) += synclinkmp.o
obj-$(CONFIG_N_HDLC) += n_hdlc.o
obj-$(CONFIG_SPECIALIX) += specialix.o
obj-$(CONFIG_AMIGA_BUILTIN_SERIAL) += amiserial.o
@@ -163,6 +181,7 @@
obj-$(CONFIG_MVME147_SCC) += generic_serial.o vme_scc.o
obj-$(CONFIG_MVME162_SCC) += generic_serial.o vme_scc.o
obj-$(CONFIG_BVME6000_SCC) += generic_serial.o vme_scc.o
+obj-$(CONFIG_HVC_CONSOLE) += hvc_console.o
obj-$(CONFIG_SERIAL_TX3912) += generic_serial.o serial_tx3912.o
subdir-$(CONFIG_RIO) += rio
@@ -238,7 +257,13 @@
obj-$(CONFIG_MACHZ_WDT) += machzwd.o
obj-$(CONFIG_SH_WDT) += shwdt.o
obj-$(CONFIG_EUROTECH_WDT) += eurotechwdt.o
+obj-$(CONFIG_ALIM7101_WDT) += alim7101_wdt.o
+#obj-$(CONFIG_ALIM1535_WDT) += alim1535d_wdt.o
+obj-$(CONFIG_INDYDOG) += indydog.o
+obj-$(CONFIG_SC1200_WDT) += sc1200wdt.o
+obj-$(CONFIG_WAFER_WDT) += wafer5823wdt.o
obj-$(CONFIG_SOFT_WATCHDOG) += softdog.o
+obj-$(CONFIG_AMD7XX_TCO) += amd7xx_tco.o
subdir-$(CONFIG_MWAVE) += mwave
ifeq ($(CONFIG_MWAVE),y)
|
|
From: M. R. B. <mr...@us...> - 2002-10-26 14:14:04
|
Update of /cvsroot/linuxdc/linux-sh-dc/drivers/char/drm
In directory usw-pr-cvs1:/tmp/cvs-serv18863/drivers/char/drm
Modified Files:
Tag: linux-sh-dc-2_4-branch
Config.in Makefile
Log Message:
Linux-SH 2.4.20-pre11
Index: Config.in
===================================================================
RCS file: /cvsroot/linuxdc/linux-sh-dc/drivers/char/drm/Config.in,v
retrieving revision 1.3
retrieving revision 1.3.4.1
diff -u -d -r1.3 -r1.3.4.1
--- Config.in 17 Dec 2001 04:43:48 -0000 1.3
+++ Config.in 26 Oct 2002 14:14:01 -0000 1.3.4.1
@@ -5,13 +5,13 @@
# Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.
#
-bool 'Direct Rendering Manager (XFree86 4.1.0 and higher DRI support)' CONFIG_DRM
-if [ "$CONFIG_DRM" != "n" ]; then
- tristate ' 3dfx Banshee/Voodoo3+' CONFIG_DRM_TDFX
- tristate ' 3dlabs GMX 2000' CONFIG_DRM_GAMMA
- tristate ' ATI Rage 128' CONFIG_DRM_R128
- dep_tristate ' ATI Radeon' CONFIG_DRM_RADEON $CONFIG_AGP
- dep_tristate ' Intel I810' CONFIG_DRM_I810 $CONFIG_AGP
- dep_tristate ' Matrox g200/g400' CONFIG_DRM_MGA $CONFIG_AGP
- dep_tristate ' NEC PowerVR2' CONFIG_DRM_PVR2 $CONFIG_SH_DREAMCAST
-fi
+tristate ' 3dfx Banshee/Voodoo3+' CONFIG_DRM_TDFX
+#tristate ' 3dlabs GMX 2000' CONFIG_DRM_GAMMA
+tristate ' ATI Rage 128' CONFIG_DRM_R128
+dep_tristate ' ATI Radeon' CONFIG_DRM_RADEON $CONFIG_AGP
+dep_tristate ' Intel I810' CONFIG_DRM_I810 $CONFIG_AGP
+dep_mbool ' Enabled XFree 4.1 ioctl interface by default' CONFIG_DRM_I810_XFREE_41 $CONFIG_DRM_I810
+dep_tristate ' Intel 830M' CONFIG_DRM_I830 $CONFIG_AGP
+dep_tristate ' Matrox g200/g400' CONFIG_DRM_MGA $CONFIG_AGP
+dep_tristate ' SiS' CONFIG_DRM_SIS $CONFIG_AGP
+dep_tristate ' NEC PowerVR2' CONFIG_DRM_PVR2 $CONFIG_SH_DREAMCAST
Index: Makefile
===================================================================
RCS file: /cvsroot/linuxdc/linux-sh-dc/drivers/char/drm/Makefile,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -u -d -r1.2 -r1.2.4.1
--- Makefile 15 Sep 2001 02:59:50 -0000 1.2
+++ Makefile 26 Oct 2002 14:14:01 -0000 1.2.4.1
@@ -3,15 +3,18 @@
# Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.
O_TARGET := drm.o
-list-multi := gamma.o tdfx.o r128.o mga.o i810.o radeon.o ffb.o pvr2.o
+list-multi := gamma.o tdfx.o r128.o mga.o i810.o i830.o radeon.o ffb.o sis.o pvr2.o
gamma-objs := gamma_drv.o gamma_dma.o
tdfx-objs := tdfx_drv.o
r128-objs := r128_drv.o r128_cce.o r128_state.o
mga-objs := mga_drv.o mga_dma.o mga_state.o mga_warp.o
i810-objs := i810_drv.o i810_dma.o
+i830-objs := i830_drv.o i830_dma.o
+
radeon-objs := radeon_drv.o radeon_cp.o radeon_state.o
ffb-objs := ffb_drv.o ffb_context.o
+sis-objs := sis_drv.o sis_ds.o sis_mm.o
pvr2-objs := pvr2_drv.o
obj-$(CONFIG_DRM_GAMMA) += gamma.o
@@ -20,7 +23,9 @@
obj-$(CONFIG_DRM_RADEON)+= radeon.o
obj-$(CONFIG_DRM_MGA) += mga.o
obj-$(CONFIG_DRM_I810) += i810.o
+obj-$(CONFIG_DRM_I830) += i830.o
obj-$(CONFIG_DRM_FFB) += ffb.o
+obj-$(CONFIG_DRM_SIS) += sis.o
obj-$(CONFIG_DRM_PVR2) += pvr2.o
include $(TOPDIR)/Rules.make
@@ -37,6 +42,9 @@
i810.o: $(i810-objs) $(lib)
$(LD) -r -o $@ $(i810-objs) $(lib)
+i830.o: $(i830-objs) $(lib)
+ $(LD) -r -o $@ $(i830-objs) $(lib)
+
r128.o: $(r128-objs) $(lib)
$(LD) -r -o $@ $(r128-objs) $(lib)
@@ -45,6 +53,9 @@
ffb.o: $(ffb-objs) $(lib)
$(LD) -r -o $@ $(ffb-objs) $(lib)
+
+sis.o: $(sis-objs) $(lib)
+ $(LD) -r -o $@ $(sis-objs) $(lib)
pvr2.o: $(pvr2-objs) $(lib)
$(LD) -r -o $@ $(pvr2-objs) $(lib)
|
|
From: M. R. B. <mr...@us...> - 2002-10-26 14:14:03
|
Update of /cvsroot/linuxdc/linux-sh-dc/arch/sh
In directory usw-pr-cvs1:/tmp/cvs-serv18863/arch/sh
Modified Files:
Tag: linux-sh-dc-2_4-branch
config.in
Log Message:
Linux-SH 2.4.20-pre11
Index: config.in
===================================================================
RCS file: /cvsroot/linuxdc/linux-sh-dc/arch/sh/config.in,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -d -r1.5 -r1.5.2.1
--- config.in 23 Jan 2002 06:56:48 -0000 1.5
+++ config.in 26 Oct 2002 14:14:01 -0000 1.5.2.1
@@ -129,6 +129,7 @@
hex 'Physical memory start address' CONFIG_MEMORY_START 08000000
hex 'Physical memory size' CONFIG_MEMORY_SIZE 00400000
fi
+dep_bool 'Enable OC RAM zone (experimental)' CONFIG_SCRATCH_SPACE $CONFIG_EXPERIMENTAL
endmenu
if [ "$CONFIG_SH_HP690" = "y" ]; then
@@ -181,6 +182,10 @@
fi
bool 'DMA controller (DMAC) support' CONFIG_SH_DMA
+bool 'Default bootloader kernel arguments' CONFIG_CMDLINE_BOOL
+if [ "$CONFIG_CMDLINE_BOOL" = "y" ] ; then
+ string 'Initial kernel command string' CONFIG_CMDLINE "console=ttySC1,115200"
+fi
bool 'PCI support' CONFIG_PCI
if [ "$CONFIG_PCI" = "y" ]; then
@@ -392,3 +397,5 @@
bool 'Early printk support' CONFIG_SH_EARLY_PRINTK
fi
endmenu
+
+source lib/Config.in
|
|
From: M. R. B. <mr...@us...> - 2002-10-26 14:14:03
|
Update of /cvsroot/linuxdc/linux-sh-dc
In directory usw-pr-cvs1:/tmp/cvs-serv18863
Modified Files:
Tag: linux-sh-dc-2_4-branch
ChangeLog.dc Makefile
Added Files:
Tag: linux-sh-dc-2_4-branch
AGAINST-2.4.20-pre11
Removed Files:
Tag: linux-sh-dc-2_4-branch
AGAINST-2.4.19
Log Message:
Linux-SH 2.4.20-pre11
--- NEW FILE: AGAINST-2.4.20-pre11 ---
Index: ChangeLog.dc
===================================================================
RCS file: /cvsroot/linuxdc/linux-sh-dc/ChangeLog.dc,v
retrieving revision 1.56.2.1
retrieving revision 1.56.2.2
diff -u -d -r1.56.2.1 -r1.56.2.2
--- ChangeLog.dc 26 Oct 2002 12:36:11 -0000 1.56.2.1
+++ ChangeLog.dc 26 Oct 2002 14:14:00 -0000 1.56.2.2
@@ -1,5 +1,16 @@
2002-10-26 M. R. Brown <mr...@li...>
+ Linux-SH 2.4.20-pre11
+
+ * AGAINST-2.4.20-pre11: New file.
+ * AGAINST-2.4.19: Remove.
+
+ * Documentation/Configure.help, Makefile, arch/sh/config.in,
+ drivers/char/drm/Config.in, drivers/char/drm/Makefile,
+ drivers/char/Makefile, drivers/mtd/maps/Config.in,
+ drivers/mtd/maps/Makefile, drivers/sound/Config.in: Merge changes from
+ Linux-SH 2.4.20-pre11.
+
Linux-SH 2.4.19
* AGAINST-2.4.19: New file.
Index: Makefile
===================================================================
RCS file: /cvsroot/linuxdc/linux-sh-dc/Makefile,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -d -r1.2.2.1 -r1.2.2.2
--- Makefile 26 Oct 2002 12:36:11 -0000 1.2.2.1
+++ Makefile 26 Oct 2002 14:14:00 -0000 1.2.2.2
@@ -1,7 +1,7 @@
VERSION = 2
PATCHLEVEL = 4
-SUBLEVEL = 19
-EXTRAVERSION = -sh-dc
+SUBLEVEL = 20
+EXTRAVERSION = -pre11-sh-dc
KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
@@ -170,7 +170,7 @@
DRIVERS-$(CONFIG_SBUS) += drivers/sbus/sbus_all.o
DRIVERS-$(CONFIG_ZORRO) += drivers/zorro/driver.o
DRIVERS-$(CONFIG_FC4) += drivers/fc4/fc4.a
-DRIVERS-$(CONFIG_PPC) += drivers/macintosh/macintosh.o
+DRIVERS-$(CONFIG_PPC32) += drivers/macintosh/macintosh.o
DRIVERS-$(CONFIG_MAC) += drivers/macintosh/macintosh.o
DRIVERS-$(CONFIG_ISAPNP) += drivers/pnp/pnp.o
DRIVERS-$(CONFIG_SGI_IP22) += drivers/sgi/sgi.a
@@ -180,11 +180,13 @@
DRIVERS-$(CONFIG_TC) += drivers/tc/tc.a
DRIVERS-$(CONFIG_USB) += drivers/usb/usbdrv.o
DRIVERS-$(CONFIG_INPUT) += drivers/input/inputdrv.o
+DRIVERS-$(CONFIG_HIL) += drivers/hil/hil.o
DRIVERS-$(CONFIG_I2O) += drivers/message/i2o/i2o.o
DRIVERS-$(CONFIG_IRDA) += drivers/net/irda/irda.o
DRIVERS-$(CONFIG_I2C) += drivers/i2c/i2c.o
DRIVERS-$(CONFIG_PHONE) += drivers/telephony/telephony.o
DRIVERS-$(CONFIG_MD) += drivers/md/mddev.o
+DRIVERS-$(CONFIG_GSC) += drivers/gsc/gscbus.o
DRIVERS-$(CONFIG_BLUEZ) += drivers/bluetooth/bluetooth.o
DRIVERS-$(CONFIG_HOTPLUG_PCI) += drivers/hotplug/vmlinux-obj.o
DRIVERS-$(CONFIG_ISDN_BOOL) += drivers/isdn/vmlinux-obj.o
@@ -259,7 +261,7 @@
# 'kbuild_2_4_nostdinc :=' or -I/usr/include for kernel code and you are not UML
# then your code is broken! KAO.
-kbuild_2_4_nostdinc := -nostdinc $(shell $(CC) -print-search-dirs | sed -ne 's/install: \(.*\)/-I \1include/gp')
+kbuild_2_4_nostdinc := -nostdinc -iwithprefix include
export kbuild_2_4_nostdinc
export CPPFLAGS CFLAGS CFLAGS_KERNEL AFLAGS AFLAGS_KERNEL
@@ -370,7 +372,7 @@
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 arch/${ARCH} -name '*.[chS]' ; } | grep -v SCCS | etags -
+ find $(SUBDIRS) init arch/${ARCH} -name '*.[chS]' ; } | grep -v SCCS | grep -v '\.svn' | etags -
# Exuberant ctags works better with -I
tags: dummy
@@ -488,7 +490,7 @@
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
+ scripts/mkdep -- `find $(FINDHPATH) \( -name SCCS -o -name .svn \) -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
--- AGAINST-2.4.19 DELETED ---
|
|
From: M. R. B. <mr...@us...> - 2002-10-26 12:36:15
|
Update of /cvsroot/linuxdc/linux-sh-dc/drivers/sound
In directory usw-pr-cvs1:/tmp/cvs-serv27880/drivers/sound
Modified Files:
Tag: linux-sh-dc-2_4-branch
Config.in Makefile
Log Message:
Linux-SH 2.4.19. Not as clean a merge as I liked, but I'll fix the brokeness at 2.4.20-pre11
Index: Config.in
===================================================================
RCS file: /cvsroot/linuxdc/linux-sh-dc/drivers/sound/Config.in,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -u -d -r1.2 -r1.2.4.1
--- Config.in 9 Jan 2002 11:13:57 -0000 1.2
+++ Config.in 26 Oct 2002 12:36:12 -0000 1.2.4.1
@@ -6,7 +6,7 @@
# Prompt user for primary drivers.
-dep_tristate ' BT878 audio dma' CONFIG_SOUND_BT878 $CONFIG_SOUND
+dep_tristate ' BT878 audio dma' CONFIG_SOUND_BT878 $CONFIG_SOUND $CONFIG_PCI
dep_tristate ' C-Media PCI (CMI8338/8738)' CONFIG_SOUND_CMPCI $CONFIG_SOUND $CONFIG_PCI
if [ "$CONFIG_SOUND_CMPCI" = "y" -o "$CONFIG_SOUND_CMPCI" = "m" ]; then
bool ' Enable legacy FM' CONFIG_SOUND_CMPCI_FM
@@ -32,23 +32,40 @@
fi
dep_tristate ' Creative SBLive! (EMU10K1)' CONFIG_SOUND_EMU10K1 $CONFIG_SOUND $CONFIG_PCI
dep_mbool ' Creative SBLive! MIDI' CONFIG_MIDI_EMU10K1 $CONFIG_SOUND_EMU10K1 $CONFIG_EXPERIMENTAL
-dep_tristate ' Crystal SoundFusion (CS4280/461x)' CONFIG_SOUND_FUSION $CONFIG_SOUND
-dep_tristate ' Crystal Sound CS4281' CONFIG_SOUND_CS4281 $CONFIG_SOUND
+dep_tristate ' Crystal SoundFusion (CS4280/461x)' CONFIG_SOUND_FUSION $CONFIG_SOUND $CONFIG_PCI
+dep_tristate ' Crystal Sound CS4281' CONFIG_SOUND_CS4281 $CONFIG_SOUND $CONFIG_PCI
+if [ "$CONFIG_SIBYTE_SB1250" = "y" -a "$CONFIG_REMOTE_DEBUG" != "y" ]; then
+ dep_tristate ' Crystal Sound CS4297a (for Swarm)' CONFIG_SOUND_BCM_CS4297A $CONFIG_SOUND
+fi
dep_tristate ' Ensoniq AudioPCI (ES1370)' CONFIG_SOUND_ES1370 $CONFIG_SOUND $CONFIG_PCI
dep_tristate ' Creative Ensoniq AudioPCI 97 (ES1371)' CONFIG_SOUND_ES1371 $CONFIG_SOUND $CONFIG_PCI
-dep_tristate ' ESS Technology Solo1' CONFIG_SOUND_ESSSOLO1 $CONFIG_SOUND
-dep_tristate ' ESS Maestro, Maestro2, Maestro2E driver' CONFIG_SOUND_MAESTRO $CONFIG_SOUND
+dep_tristate ' ESS Technology Solo1' CONFIG_SOUND_ESSSOLO1 $CONFIG_SOUND $CONFIG_PCI
+dep_tristate ' ESS Maestro, Maestro2, Maestro2E driver' CONFIG_SOUND_MAESTRO $CONFIG_SOUND $CONFIG_PCI
dep_tristate ' ESS Maestro3/Allegro driver (EXPERIMENTAL)' CONFIG_SOUND_MAESTRO3 $CONFIG_SOUND $CONFIG_PCI $CONFIG_EXPERIMENTAL
-dep_tristate ' Intel ICH (i8xx) audio support' CONFIG_SOUND_ICH $CONFIG_PCI
+dep_tristate ' Intel ICH (i8xx), SiS 7012, NVidia nForce Audio or AMD 768' CONFIG_SOUND_ICH $CONFIG_PCI
+if [ "$CONFIG_MIPS_ITE8172" = "y" -o "$CONFIG_MIPS_IVR" = "y" ]; then
+ dep_tristate ' IT8172G Sound' CONFIG_SOUND_IT8172 $CONFIG_SOUND
+fi
dep_tristate ' RME Hammerfall (RME96XX) support' CONFIG_SOUND_RME96XX $CONFIG_SOUND $CONFIG_PCI $CONFIG_EXPERIMENTAL
-dep_tristate ' S3 SonicVibes' CONFIG_SOUND_SONICVIBES $CONFIG_SOUND
+dep_tristate ' S3 SonicVibes' CONFIG_SOUND_SONICVIBES $CONFIG_SOUND $CONFIG_PCI
if [ "$CONFIG_VISWS" = "y" ]; then
- dep_tristate ' SGI Visual Workstation Sound' CONFIG_SOUND_VWSND $CONFIG_SOUND
+ dep_tristate ' SGI Visual Workstation sound' CONFIG_SOUND_VWSND $CONFIG_SOUND
+fi
+if [ "$CONFIG_SGI_IP22" = "y" ] ; then
+ dep_tristate ' SGI HAL2 sound (EXPERIMENTAL)' CONFIG_SOUND_HAL2 $CONFIG_SOUND $CONFIG_SGI_IP22 $CONFIG_EXPERIMENTAL
+fi
+
+if [ "$CONFIG_MIPS_ITE8172" = "y" -o "$CONFIG_MIPS_IVR" = "y" ]; then
+ dep_tristate ' IT8172G Sound' CONFIG_SOUND_IT8172 $CONFIG_SOUND
fi
if [ "$CONFIG_DDB5477" = "y" ]; then
dep_tristate ' NEC Vrc5477 AC97 sound' CONFIG_SOUND_VRC5477 $CONFIG_SOUND
fi
-dep_tristate ' Trident 4DWave DX/NX, SiS 7018 or ALi 5451 PCI Audio Core' CONFIG_SOUND_TRIDENT $CONFIG_SOUND
+if [ "$CONFIG_MIPS_AU1000" = "y" ]; then
+ dep_tristate ' Au1000 Sound' CONFIG_SOUND_AU1000 $CONFIG_SOUND
+fi
+
+dep_tristate ' Trident 4DWave DX/NX, SiS 7018 or ALi 5451 PCI Audio Core' CONFIG_SOUND_TRIDENT $CONFIG_SOUND $CONFIG_PCI
dep_tristate ' Support for Turtle Beach MultiSound Classic, Tahiti, Monterey' CONFIG_SOUND_MSNDCLAS $CONFIG_SOUND
if [ "$CONFIG_SOUND_MSNDCLAS" = "y" -o "$CONFIG_SOUND_MSNDCLAS" = "m" ]; then
Index: Makefile
===================================================================
RCS file: /cvsroot/linuxdc/linux-sh-dc/drivers/sound/Makefile,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -u -d -r1.2 -r1.2.4.1
--- Makefile 9 Jan 2002 11:13:57 -0000 1.2
+++ Makefile 26 Oct 2002 12:36:12 -0000 1.2.4.1
@@ -20,6 +20,7 @@
# Please leave it as is, cause the link order is significant !
+obj-$(CONFIG_SOUND_HAL2) += hal2.o
obj-$(CONFIG_SOUND_AEDSP16) += aedsp16.o
obj-$(CONFIG_SOUND_PSS) += pss.o ad1848.o mpu401.o
obj-$(CONFIG_SOUND_TRIX) += trix.o ad1848.o sb_lib.o uart401.o
@@ -64,15 +65,16 @@
obj-$(CONFIG_SOUND_ES1370) += es1370.o
obj-$(CONFIG_SOUND_ES1371) += es1371.o ac97_codec.o
obj-$(CONFIG_SOUND_VRC5477) += nec_vrc5477.o ac97_codec.o
+obj-$(CONFIG_SOUND_AU1000) += au1000.o ac97_codec.o
obj-$(CONFIG_SOUND_ESSSOLO1) += esssolo1.o
obj-$(CONFIG_SOUND_FUSION) += cs46xx.o ac97_codec.o
obj-$(CONFIG_SOUND_MAESTRO) += maestro.o
obj-$(CONFIG_SOUND_MAESTRO3) += maestro3.o ac97_codec.o
obj-$(CONFIG_SOUND_TRIDENT) += trident.o ac97_codec.o
obj-$(CONFIG_SOUND_EMU10K1) += ac97_codec.o
+obj-$(CONFIG_SOUND_BCM_CS4297A) += swarm_cs4297a.o
obj-$(CONFIG_SOUND_RME96XX) += rme96xx.o
obj-$(CONFIG_SOUND_BT878) += btaudio.o
-obj-$(CONFIG_SOUND_EMU10K1) += ac97_codec.o
ifeq ($(CONFIG_MIDI_EMU10K1),y)
obj-$(CONFIG_SOUND_EMU10K1) += sound.o
|
|
From: M. R. B. <mr...@us...> - 2002-10-26 12:36:15
|
Update of /cvsroot/linuxdc/linux-sh-dc/drivers/mtd/maps
In directory usw-pr-cvs1:/tmp/cvs-serv27880/drivers/mtd/maps
Modified Files:
Tag: linux-sh-dc-2_4-branch
Makefile
Log Message:
Linux-SH 2.4.19. Not as clean a merge as I liked, but I'll fix the brokeness at 2.4.20-pre11
Index: Makefile
===================================================================
RCS file: /cvsroot/linuxdc/linux-sh-dc/drivers/mtd/maps/Makefile,v
retrieving revision 1.3
retrieving revision 1.3.4.1
diff -u -d -r1.3 -r1.3.4.1
--- Makefile 17 Dec 2001 04:43:48 -0000 1.3
+++ Makefile 26 Oct 2002 12:36:12 -0000 1.3.4.1
@@ -11,9 +11,15 @@
obj-$(CONFIG_MTD_CFI_FLAGADM) += cfi_flagadm.o
obj-$(CONFIG_MTD_CSTM_MIPS_IXX) += cstm_mips_ixx.o
obj-$(CONFIG_MTD_DC21285) += dc21285.o
+obj-$(CONFIG_MTD_DILNETPC) += dilnetpc.o
obj-$(CONFIG_MTD_ELAN_104NC) += elan-104nc.o
+obj-$(CONFIG_MTD_EPXA10DB) += epxa10db-flash.o
obj-$(CONFIG_MTD_IQ80310) += iq80310.o
obj-$(CONFIG_MTD_L440GX) += l440gx.o
+obj-$(CONFIG_MTD_AMD766ROM) += amd766rom.o
+obj-$(CONFIG_MTD_ICH2ROM) += ich2rom.o
+obj-$(CONFIG_MTD_TSUNAMI) += tsunami_flash.o
+obj-$(CONFIG_MTD_MBX860) += mbx860.o
obj-$(CONFIG_MTD_NORA) += nora.o
obj-$(CONFIG_MTD_OCTAGON) += octagon-5066.o
obj-$(CONFIG_MTD_PHYSMAP) += physmap.o
@@ -29,6 +35,10 @@
obj-$(CONFIG_MTD_DBOX2) += dbox2-flash.o
obj-$(CONFIG_MTD_OCELOT) += ocelot.o
obj-$(CONFIG_MTD_SOLUTIONENGINE)+= solutionengine.o
+obj-$(CONFIG_MTD_PCI) += pci.o
+obj-$(CONFIG_MTD_PB1000) += pb1xxx-flash.o
+obj-$(CONFIG_MTD_PB1500) += pb1xxx-flash.o
+obj-$(CONFIG_MTD_AUTCPU12) += autcpu12-nvram.o
obj-$(CONFIG_MTD_VMU) += vmu-flash.o
include $(TOPDIR)/Rules.make
|
|
From: M. R. B. <mr...@us...> - 2002-10-26 12:36:15
|
Update of /cvsroot/linuxdc/linux-sh-dc
In directory usw-pr-cvs1:/tmp/cvs-serv27880
Modified Files:
Tag: linux-sh-dc-2_4-branch
ChangeLog.dc Makefile
Added Files:
Tag: linux-sh-dc-2_4-branch
AGAINST-2.4.19
Removed Files:
Tag: linux-sh-dc-2_4-branch
AGAINST-2.4.18
Log Message:
Linux-SH 2.4.19. Not as clean a merge as I liked, but I'll fix the brokeness at 2.4.20-pre11
--- NEW FILE: AGAINST-2.4.19 ---
Index: ChangeLog.dc
===================================================================
RCS file: /cvsroot/linuxdc/linux-sh-dc/ChangeLog.dc,v
retrieving revision 1.56
retrieving revision 1.56.2.1
diff -u -d -r1.56 -r1.56.2.1
--- ChangeLog.dc 19 Oct 2002 10:58:37 -0000 1.56
+++ ChangeLog.dc 26 Oct 2002 12:36:11 -0000 1.56.2.1
@@ -1,3 +1,13 @@
+2002-10-26 M. R. Brown <mr...@li...>
+
+ Linux-SH 2.4.19
+
+ * AGAINST-2.4.19: New file.
+ * AGAINST-2.4.18: Removed.
+
+ * Makefile, drivers/mtd/maps/Makefile, drivers/sound/Config.in,
+ drivers/sound/Makefile: Merge changes from Linux-SH 2.4.19.
+
2002-10-18 Adrian McMenamin <ad...@mc...>
* drivers/sound/aica/main.c: Parameterised
Index: Makefile
===================================================================
RCS file: /cvsroot/linuxdc/linux-sh-dc/Makefile,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- Makefile 1 May 2002 16:32:27 -0000 1.2
+++ Makefile 26 Oct 2002 12:36:11 -0000 1.2.2.1
@@ -1,11 +1,11 @@
VERSION = 2
PATCHLEVEL = 4
-SUBLEVEL = 18
+SUBLEVEL = 19
EXTRAVERSION = -sh-dc
KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
-ARCH := sh
+ARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/)
KERNELPATH=kernel-$(shell echo $(KERNELRELEASE) | sed -e "s/-//g")
CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \
@@ -14,7 +14,7 @@
TOPDIR := $(shell /bin/pwd)
HPATH = $(TOPDIR)/include
-FINDHPATH = $(HPATH)/asm $(HPATH)/linux $(HPATH)/scsi $(HPATH)/net
+FINDHPATH = $(HPATH)/asm $(HPATH)/linux $(HPATH)/scsi $(HPATH)/net $(HPATH)/math-emu
HOSTCC = gcc
HOSTCFLAGS = -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer
@@ -89,7 +89,10 @@
CPPFLAGS := -D__KERNEL__ -I$(HPATH)
CFLAGS := $(CPPFLAGS) -Wall -Wstrict-prototypes -Wno-trigraphs -O2 \
- -fomit-frame-pointer -fno-strict-aliasing -fno-common
+ -fno-strict-aliasing -fno-common
+ifndef CONFIG_FRAME_POINTER
+CFLAGS += -fomit-frame-pointer
+endif
AFLAGS := -D__ASSEMBLY__ $(CPPFLAGS)
#
@@ -140,9 +143,8 @@
DRIVERS-$(CONFIG_DRM_NEW) += drivers/char/drm/drm.o
DRIVERS-$(CONFIG_DRM_OLD) += drivers/char/drm-4.0/drm.o
DRIVERS-$(CONFIG_NUBUS) += drivers/nubus/nubus.a
-DRIVERS-$(CONFIG_ISDN) += drivers/isdn/isdn.a
DRIVERS-$(CONFIG_NET_FC) += drivers/net/fc/fc.o
-DRIVERS-$(CONFIG_APPLETALK) += drivers/net/appletalk/appletalk.o
+DRIVERS-$(CONFIG_DEV_APPLETALK) += drivers/net/appletalk/appletalk.o
DRIVERS-$(CONFIG_TR) += drivers/net/tokenring/tr.o
DRIVERS-$(CONFIG_WAN) += drivers/net/wan/wan.o
DRIVERS-$(CONFIG_ARCNET) += drivers/net/arcnet/arcnetdrv.o
@@ -168,7 +170,7 @@
DRIVERS-$(CONFIG_SBUS) += drivers/sbus/sbus_all.o
DRIVERS-$(CONFIG_ZORRO) += drivers/zorro/driver.o
DRIVERS-$(CONFIG_FC4) += drivers/fc4/fc4.a
-DRIVERS-$(CONFIG_ALL_PPC) += drivers/macintosh/macintosh.o
+DRIVERS-$(CONFIG_PPC) += drivers/macintosh/macintosh.o
DRIVERS-$(CONFIG_MAC) += drivers/macintosh/macintosh.o
DRIVERS-$(CONFIG_ISAPNP) += drivers/pnp/pnp.o
DRIVERS-$(CONFIG_SGI_IP22) += drivers/sgi/sgi.a
@@ -185,6 +187,7 @@
DRIVERS-$(CONFIG_MD) += drivers/md/mddev.o
DRIVERS-$(CONFIG_BLUEZ) += drivers/bluetooth/bluetooth.o
DRIVERS-$(CONFIG_HOTPLUG_PCI) += drivers/hotplug/vmlinux-obj.o
+DRIVERS-$(CONFIG_ISDN_BOOL) += drivers/isdn/vmlinux-obj.o
DRIVERS-$(CONFIG_MAPLE) += drivers/maple/maplebus.o
DRIVERS := $(DRIVERS-y)
@@ -202,10 +205,15 @@
drivers/zorro/devlist.h drivers/zorro/gen-devlist \
drivers/sound/bin2hex drivers/sound/hex2hex \
drivers/atm/fore200e_mkfirm drivers/atm/{pca,sba}*{.bin,.bin1,.bin2} \
+ drivers/scsi/aic7xxx/aicasm/aicasm \
drivers/scsi/aic7xxx/aicasm/aicasm_gram.c \
+ drivers/scsi/aic7xxx/aicasm/aicasm_gram.h \
+ drivers/scsi/aic7xxx/aicasm/aicasm_macro_gram.c \
+ drivers/scsi/aic7xxx/aicasm/aicasm_macro_gram.h \
+ drivers/scsi/aic7xxx/aicasm/aicasm_macro_scan.c \
drivers/scsi/aic7xxx/aicasm/aicasm_scan.c \
+ drivers/scsi/aic7xxx/aicasm/aicdb.h \
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 \
@@ -244,6 +252,16 @@
include arch/$(ARCH)/Makefile
+# Extra cflags for kbuild 2.4. The default is to forbid includes by kernel code
+# from user space headers. Some UML code requires user space headers, in the
+# UML Makefiles add 'kbuild_2_4_nostdinc :=' before include Rules.make. No
+# other kernel code should include user space headers, if you need
+# 'kbuild_2_4_nostdinc :=' or -I/usr/include for kernel code and you are not UML
+# then your code is broken! KAO.
+
+kbuild_2_4_nostdinc := -nostdinc $(shell $(CC) -print-search-dirs | sed -ne 's/install: \(.*\)/-I \1include/gp')
+export kbuild_2_4_nostdinc
+
export CPPFLAGS CFLAGS CFLAGS_KERNEL AFLAGS AFLAGS_KERNEL
export NETWORKS DRIVERS LIBS HEAD LDFLAGS LINKFLAGS MAKEBOOT ASFLAGS
@@ -259,8 +277,8 @@
boot: vmlinux
@$(MAKE) CFLAGS="$(CFLAGS) $(CFLAGS_KERNEL)" -C arch/$(ARCH)/boot
-vmlinux: include/linux/version.h $(CONFIGURATION) init/main.o init/version.o linuxsubdirs
- $(LD) $(LINKFLAGS) $(HEAD) init/main.o init/version.o \
+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 \
--start-group \
$(CORE_FILES) \
$(DRIVERS) \
@@ -307,25 +325,29 @@
. scripts/mkversion > .tmpversion
@mv -f .tmpversion .version
+uts_len := 64
+uts_truncate := sed -e 's/\(.\{1,$(uts_len)\}\).*/\1/'
+
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 -n \#`cat .version` > .ver1
+ @if [ -n "$(CONFIG_SMP)" ] ; then echo -n " SMP" >> .ver1; fi
+ @if [ -f .name ]; then echo -n \-`cat .name` >> .ver1; fi
+ @LANG=C echo ' '`date` >> .ver1
+ @echo \#define UTS_VERSION \"`cat .ver1 | $(uts_truncate)`\" > .ver
+ @LANG=C 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_COMPILE_HOST \"`hostname | $(uts_truncate)`\" >> .ver
+ @([ -x /bin/dnsdomainname ] && /bin/dnsdomainname > .ver1) || \
+ ([ -x /bin/domainname ] && /bin/domainname > .ver1) || \
+ echo > .ver1
+ @echo \#define LINUX_COMPILE_DOMAIN \"`cat .ver1 | $(uts_truncate)`\" >> .ver
@echo \#define LINUX_COMPILER \"`$(CC) $(CFLAGS) -v 2>&1 | tail -1`\" >> .ver
@mv -f .ver $@
+ @rm -f .ver1
include/linux/version.h: ./Makefile
+ @expr length "$(KERNELRELEASE)" \<= $(uts_len) > /dev/null || \
+ (echo KERNELRELEASE \"$(KERNELRELEASE)\" exceeds $(uts_len) characters >&2; false)
@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
@@ -337,15 +359,18 @@
$(CC) $(CFLAGS) $(CFLAGS_KERNEL) -DUTS_MACHINE='"$(ARCH)"' -DKBUILD_BASENAME=$(subst $(comma),_,$(subst -,_,$(*F))) -c -o init/version.o init/version.c
init/main.o: init/main.c include/config/MARKER
- $(CC) $(CFLAGS) $(CFLAGS_KERNEL) $(PROFILING) -DKBUILD_BASENAME=$(subst $(comma),_,$(subst -,_,$(*F))) -c -o $*.o $<
+ $(CC) $(CFLAGS) $(CFLAGS_KERNEL) $(PROFILING) -DKBUILD_BASENAME=$(subst $(comma),_,$(subst -,_,$(*F))) -c -o $@ $<
+
+init/do_mounts.o: init/do_mounts.c include/config/MARKER
+ $(CC) $(CFLAGS) $(CFLAGS_KERNEL) $(PROFILING) -DKBUILD_BASENAME=$(subst $(comma),_,$(subst -,_,$(*F))) -c -o $@ $<
fs lib mm ipc kernel drivers net: dummy
$(MAKE) CFLAGS="$(CFLAGS) $(CFLAGS_KERNEL)" $(subst $@, _dir_$@, $@)
TAGS: dummy
- etags `find include/asm-$(ARCH) -name '*.h'`
- find include -type d \( -name "asm-*" -o -name config \) -prune -o -name '*.h' -print | xargs etags -a
- find $(SUBDIRS) init -name '*.[ch]' | xargs etags -a
+ { find include/asm-${ARCH} -name '*.h' -print ; \
+ find include -type d \( -name "asm-*" -o -name config \) -prune -o -name '*.h' -print ; \
+ find $(SUBDIRS) init arch/${ARCH} -name '*.[chS]' ; } | grep -v SCCS | etags -
# Exuberant ctags works better with -I
tags: dummy
@@ -452,6 +477,11 @@
htmldocs: sgmldocs
$(MAKE) -C Documentation/DocBook html
+
+mandocs:
+ chmod 755 $(TOPDIR)/scripts/kernel-doc
+ chmod 755 $(TOPDIR)/scripts/split-man
+ $(MAKE) -C Documentation/DocBook man
sums:
find . -type f -print | sort | xargs sum > .SUMS
--- AGAINST-2.4.18 DELETED ---
|
|
From: Adrian M. <zx8...@us...> - 2002-10-19 10:58:41
|
Update of /cvsroot/linuxdc/linux-sh-dc In directory usw-pr-cvs1:/tmp/cvs-serv1280 Modified Files: ChangeLog.dc Log Message: Date error in ChangeLog fixed Index: ChangeLog.dc =================================================================== RCS file: /cvsroot/linuxdc/linux-sh-dc/ChangeLog.dc,v retrieving revision 1.55 retrieving revision 1.56 diff -u -d -r1.55 -r1.56 --- ChangeLog.dc 18 Oct 2002 22:19:27 -0000 1.55 +++ ChangeLog.dc 19 Oct 2002 10:58:37 -0000 1.56 @@ -1,4 +1,4 @@ -2002-09-18 Adrian McMenamin <ad...@mc...> +2002-10-18 Adrian McMenamin <ad...@mc...> * drivers/sound/aica/main.c: Parameterised loading added (insmod aica sleeps=1 to lighten |
|
From: Adrian M. <zx8...@us...> - 2002-10-18 22:19:31
|
Update of /cvsroot/linuxdc/linux-sh-dc/drivers/sound/aica
In directory usw-pr-cvs1:/tmp/cvs-serv9648/drivers/sound/aica
Modified Files:
main.c
Log Message:
Sound driver updated
Index: main.c
===================================================================
RCS file: /cvsroot/linuxdc/linux-sh-dc/drivers/sound/aica/main.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- main.c 30 Jan 2002 00:20:38 -0000 1.5
+++ main.c 18 Oct 2002 22:19:28 -0000 1.6
@@ -68,6 +68,10 @@
static int currentpoint;
static struct semaphore dsp_mutex;
+static int sleeps = 0; /* default is not to sleep for hi-sample rate sounds */
+
+MODULE_PARM(sleeps, "i");
+
typedef struct {
uint32_t cmd; /* Command ID */
uint32_t pos; /* Sample position */
@@ -320,7 +324,7 @@
aica_dev_t *devc = (aica_dev_t *) (file->private_data);
int playpoint, i;
if (chanh->freq < 23000) {
- interruptible_sleep_on_timeout(&(devc->open_wait), HZ/5);
+ interruptible_sleep_on_timeout(&(devc->open_wait), HZ / 5);
}
if (devc->last_write_length > 0) {
spu_write_wait();
@@ -341,7 +345,7 @@
for (i = 0; i < (HZ * 2); i++) {
- if (chanh->freq < 23000)
+ if ((chanh->freq < 23000) || (sleeps > 0))
interruptible_sleep_on_timeout(&
(devc->
open_wait),
@@ -432,7 +436,7 @@
if ((currentpoint + total_count) > 0x8000) {
currentpoint = 0;
do {
- if (chanh->freq < 23000)
+ if ((chanh->freq < 23000) || (sleeps > 0))
interruptible_sleep_on_timeout(&
(devc->
open_wait),
@@ -788,7 +792,7 @@
}
devc->next_dev = NULL;
- devc->channel = 0;
+ devc->channel = 0;
aica_dev_list = devc;
return 0;
|
|
From: Adrian M. <zx8...@us...> - 2002-10-18 22:19:30
|
Update of /cvsroot/linuxdc/linux-sh-dc In directory usw-pr-cvs1:/tmp/cvs-serv9648 Modified Files: ChangeLog.dc Log Message: Sound driver updated Index: ChangeLog.dc =================================================================== RCS file: /cvsroot/linuxdc/linux-sh-dc/ChangeLog.dc,v retrieving revision 1.54 retrieving revision 1.55 diff -u -d -r1.54 -r1.55 --- ChangeLog.dc 20 Sep 2002 19:44:05 -0000 1.54 +++ ChangeLog.dc 18 Oct 2002 22:19:27 -0000 1.55 @@ -1,3 +1,11 @@ +2002-09-18 Adrian McMenamin <ad...@mc...> + + * drivers/sound/aica/main.c: Parameterised + loading added (insmod aica sleeps=1 to lighten + load on system from driver playing back + high sample rate sounds) + + 2002-09-20 Adrian McMenamin <ad...@mc...> vmublk files removed as they only saved 1.25k |
|
From: Adrian M. <zx8...@us...> - 2002-09-20 19:46:06
|
Update of /cvsroot/linuxdc/linux-sh-dc/drivers/mtd/devices In directory usw-pr-cvs1:/tmp/cvs-serv8956/drivers/mtd/devices Removed Files: Config.in Makefile vmublk.c Log Message: vmublk code removed --- Config.in DELETED --- --- Makefile DELETED --- --- vmublk.c DELETED --- |
|
From: Adrian M. <zx8...@us...> - 2002-09-20 19:44:09
|
Update of /cvsroot/linuxdc/linux-sh-dc In directory usw-pr-cvs1:/tmp/cvs-serv8415 Modified Files: ChangeLog.dc Log Message: vmublk code removed Index: ChangeLog.dc =================================================================== RCS file: /cvsroot/linuxdc/linux-sh-dc/ChangeLog.dc,v retrieving revision 1.53 retrieving revision 1.54 diff -u -d -r1.53 -r1.54 --- ChangeLog.dc 18 Sep 2002 22:49:14 -0000 1.53 +++ ChangeLog.dc 20 Sep 2002 19:44:05 -0000 1.54 @@ -1,3 +1,12 @@ +2002-09-20 Adrian McMenamin <ad...@mc...> + + vmublk files removed as they only saved 1.25k + on a zImage compile. Currently these files can + also been seen at sf project vmublk + + * drivers/mtd/devices: Directory removed + + 2002-09-18 Adrian McMenamin <ad...@mc...> vmublk - a thin vmu block device added. This is |
|
From: Adrian M. <zx8...@us...> - 2002-09-18 22:49:17
|
Update of /cvsroot/linuxdc/linux-sh-dc In directory usw-pr-cvs1:/tmp/cvs-serv2545 Modified Files: ChangeLog.dc Log Message: vmublk code tidied up Index: ChangeLog.dc =================================================================== RCS file: /cvsroot/linuxdc/linux-sh-dc/ChangeLog.dc,v retrieving revision 1.52 retrieving revision 1.53 diff -u -d -r1.52 -r1.53 --- ChangeLog.dc 18 Sep 2002 20:23:25 -0000 1.52 +++ ChangeLog.dc 18 Sep 2002 22:49:14 -0000 1.53 @@ -1,5 +1,14 @@ 2002-09-18 Adrian McMenamin <ad...@mc...> + vmublk - a thin vmu block device added. This is + thin (and non-cacheing) alternative to mtdblock. + mtdblock is designed for large erasesize mtds, + vmublk is a thinner alternative (though mtdblock + can be used) for the vmu. + + * drivers/mtd/devices/Config.in: fixed + * drivers/mtd/devices/vmublk.c: tidied + * drivers/mtd/devices/Makefile: Makefile support *drivers/mtd/devices/Config.in: support for vmu |
