linuxconsole-commit Mailing List for Linux Console Project (Page 39)

Brought to you by: esr, jsimmons, skitt, vojtech

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

Flat | Threaded

<< < 1 .. 37 38 39 40 41 .. 69 > >> (Page 39 of 69)

[Linuxconsole-commit]CVS: ruby/linux/drivers/video vgacon.c,1.62,1.63

From: James S. <jsi...@us...> - 2002-03-15 17:24:41

Update of /cvsroot/linuxconsole/ruby/linux/drivers/video
In directory usw-pr-cvs1:/tmp/cvs-serv31675

Modified Files:
	vgacon.c 
Log Message:
Fixed nasty bug that lead to a oops.

Index: vgacon.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/video/vgacon.c,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -d -r1.62 -r1.63
--- vgacon.c	14 Mar 2002 22:32:23 -0000	1.62
+++ vgacon.c	15 Mar 2002 17:24:37 -0000	1.63
@@ -480,6 +480,7 @@
 	}
 	vgacon_state.mode = MODE_TEXT;
 
+	vc->display_fg = vt;
 	vt->data_hook = (void *) &vgacon_state;
 	
 	if (init) {

[Linuxconsole-commit]CVS: ruby/linux/drivers/usb hid-ff.c,1.5,1.6

From: johann d. <jd...@us...> - 2002-03-14 23:21:02

Update of /cvsroot/linuxconsole/ruby/linux/drivers/usb
In directory usw-pr-cvs1:/tmp/cvs-serv32692

Modified Files:
	hid-ff.c 
Log Message:
Moved code around (to group functions directly called from outside).


Index: hid-ff.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/usb/hid-ff.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- hid-ff.c	14 Mar 2002 23:17:43 -0000	1.5
+++ hid-ff.c	14 Mar 2002 23:20:59 -0000	1.6
@@ -225,47 +225,6 @@
 
 }
 
-static void hid_lgff_make_rumble(struct hid_device* hid)
-{
-	struct hid_ff_logitech *lgff = hid->ff_private;
-	char packet[] = {0x03, 0x42, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00};
-	int err;
-	int left = 0, right = 0;
-	int i;
-
-	dbg("in hid_make_rumble");
-	memcpy(lgff->buf, packet, 8);
-
-
-	for (i=0; i<LGFF_EFFECTS; ++i) {
-		if (test_bit(EFFECT_USED, lgff->effects[i].flags)
-		    && test_bit(EFFECT_PLAYING, lgff->effects[i].flags)) {
-			left += lgff->effects[i].left;
-			right += lgff->effects[i].right;
-		}
-	}
-
-	lgff->buf[3] = left > 0x7f ? 0x7f : left;
-	lgff->buf[4] = right > 0x7f ? 0x7f : right;
-
-	/*FIXME: needs a queue. I should at least check if the urb is
-	  available */
-	lgff->urbffout->pipe = usb_sndctrlpipe(hid->dev, 0);
-	lgff->ffcr.bRequestType = USB_TYPE_CLASS | USB_DIR_OUT | USB_RECIP_INTERFACE;
-	lgff->urbffout->transfer_buffer_length = lgff->ffcr.wLength = 8;
-	lgff->ffcr.bRequest = 9;
-	lgff->ffcr.wValue = 0x0203;    /*NOTE: Potential problem with 
-					 little/big endian */
-	lgff->ffcr.wIndex = 0;
-	
-	lgff->urbffout->dev = hid->dev;
-	
-	if ((err=usb_submit_urb(lgff->urbffout, GFP_ATOMIC)))
-		warn("usb_submit_urb returned %d", err);
-	dbg("rumble urb submited");
-}
-
-
 /* Erase all effects this process owns */
 static int hid_lgff_flush(struct input_dev *dev, struct file *file)
 {
@@ -307,16 +266,6 @@
 	return 0;
 }
 
-static void hid_lgff_ctrl_out(struct urb *urb)
-{
-	struct hid_device *hid = urb->context;
-
-	if (urb->status)
-		warn("hid_irq_ffout status %d received", urb->status);
-
-	wake_up(&((struct hid_ff_logitech *)(hid->ff_private))->wait);
-}
-
 static int hid_lgff_upload_effect(struct input_dev* input,
 				  struct ff_effect* effect)
 {
@@ -382,6 +331,56 @@
 
 	spin_unlock_irqrestore(&lgff->lock, flags);
 	return 0;
+}
+
+static void hid_lgff_make_rumble(struct hid_device* hid)
+{
+	struct hid_ff_logitech *lgff = hid->ff_private;
+	char packet[] = {0x03, 0x42, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00};
+	int err;
+	int left = 0, right = 0;
+	int i;
+
+	dbg("in hid_make_rumble");
+	memcpy(lgff->buf, packet, 8);
+
+
+	for (i=0; i<LGFF_EFFECTS; ++i) {
+		if (test_bit(EFFECT_USED, lgff->effects[i].flags)
+		    && test_bit(EFFECT_PLAYING, lgff->effects[i].flags)) {
+			left += lgff->effects[i].left;
+			right += lgff->effects[i].right;
+		}
+	}
+
+	lgff->buf[3] = left > 0x7f ? 0x7f : left;
+	lgff->buf[4] = right > 0x7f ? 0x7f : right;
+
+	/*FIXME: needs a queue. I should at least check if the urb is
+	  available */
+	lgff->urbffout->pipe = usb_sndctrlpipe(hid->dev, 0);
+	lgff->ffcr.bRequestType = USB_TYPE_CLASS | USB_DIR_OUT | USB_RECIP_INTERFACE;
+	lgff->urbffout->transfer_buffer_length = lgff->ffcr.wLength = 8;
+	lgff->ffcr.bRequest = 9;
+	lgff->ffcr.wValue = 0x0203;    /*NOTE: Potential problem with 
+					 little/big endian */
+	lgff->ffcr.wIndex = 0;
+	
+	lgff->urbffout->dev = hid->dev;
+	
+	if ((err=usb_submit_urb(lgff->urbffout, GFP_ATOMIC)))
+		warn("usb_submit_urb returned %d", err);
+	dbg("rumble urb submited");
+}
+
+static void hid_lgff_ctrl_out(struct urb *urb)
+{
+	struct hid_device *hid = urb->context;
+
+	if (urb->status)
+		warn("hid_irq_ffout status %d received", urb->status);
+
+	wake_up(&((struct hid_ff_logitech *)(hid->ff_private))->wait);
 }
 
 /* Lock must be held by caller */

[Linuxconsole-commit]CVS: ruby/linux/drivers/usb hid-ff.c,1.4,1.5

From: johann d. <jd...@us...> - 2002-03-14 23:17:46

Update of /cvsroot/linuxconsole/ruby/linux/drivers/usb
In directory usw-pr-cvs1:/tmp/cvs-serv31821

Modified Files:
	hid-ff.c 
Log Message:
Added locking.
Wait for the control urb to be unlinked before deallocating it.


Index: hid-ff.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/usb/hid-ff.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- hid-ff.c	11 Mar 2002 23:25:46 -0000	1.4
+++ hid-ff.c	14 Mar 2002 23:17:43 -0000	1.5
@@ -37,12 +37,14 @@
 #include "hid.h"
 
 /* Effect status */
-#define EFFECT_STARTED 0     /* Effect is going to play after some time (ff_replay.delay) */
+#define EFFECT_STARTED 0     /* Effect is going to play after some time
+				(ff_replay.delay) */
 #define EFFECT_PLAYING 1     /* Effect is being played */
 #define EFFECT_USED    2
 
 /* Check that the current process can access an effect */
-#define CHECK_OWNERSHIP(effect) (current->pid == 0 || effect.owner == current->pid)
+#define CHECK_OWNERSHIP(effect) (current->pid == 0 \
+        || effect.owner == current->pid)
 
 
 /* Drivers' initializing functions */
@@ -61,12 +63,14 @@
 	{0, 0, NULL} /* Terminating entry */
 };
 
-static struct hid_ff_initializer *hid_get_ff_init(__u16 idVendor, __u16 idProduct)
+static struct hid_ff_initializer *hid_get_ff_init(__u16 idVendor,
+						  __u16 idProduct)
 {
 	struct hid_ff_initializer *init;
 	for (init = inits;
-	     init->idVendor && 
-		     !(init->idVendor == idVendor && init->idProduct == idProduct);
+	     init->idVendor
+		     && !(init->idVendor == idVendor
+			  && init->idProduct == idProduct);
 	     init++);
 
 	return init->idVendor? init : NULL;
@@ -76,7 +80,8 @@
 {
 	struct hid_ff_initializer *init;
 
-	init = hid_get_ff_init(hid->dev->descriptor.idVendor, hid->dev->descriptor.idProduct);
+	init = hid_get_ff_init(hid->dev->descriptor.idVendor,
+			       hid->dev->descriptor.idProduct);
 
 	return init? init->init(hid) : -ENOSYS;
 }
@@ -111,20 +116,25 @@
 	struct usb_ctrlrequest ffcr; /* ff commands use control URBs */
 	char buf[LGFF_BUFFER_SIZE];
 	struct lgff_effect effects[LGFF_EFFECTS];
+	spinlock_t lock;             /* device-level lock. Having locks on
+					a per-effect basis could be nice, but
+					isn't really necessary */
+	wait_queue_head_t wait;
 };
 
 
 static void hid_lgff_ctrl_out(struct urb *urb);
 static void hid_lgff_exit(struct hid_device* hid);
-static int hid_lgff_event(struct hid_device *hid, struct input_dev* input,
+static int hid_lgff_event(struct hid_device *hid, struct input_dev *input,
 			  unsigned int type, unsigned int code, int value);
 static void hid_lgff_make_rumble(struct hid_device* hid);
 
 static int hid_lgff_flush(struct input_dev *input, struct file *file);
-static int hid_lgff_upload_effect(struct input_dev* input,
-				  struct ff_effect* effect);
+static int hid_lgff_upload_effect(struct input_dev *input,
+				  struct ff_effect *effect);
 static int hid_lgff_erase(struct input_dev *input, int id);
-
+static void hid_lgff_ctrl_playback(struct hid_device* hid, struct lgff_effect*,
+				   int play);
 
 static int hid_lgff_init(struct hid_device* hid)
 {
@@ -139,6 +149,9 @@
 
 	hid->ff_private = private;
 
+	spin_lock_init(&private->lock);
+	init_waitqueue_head(&private->wait);
+
 	/* Event and exit callbacks */
 	hid->ff_exit = hid_lgff_exit;
 	hid->ff_event = hid_lgff_event;
@@ -169,9 +182,24 @@
 static void hid_lgff_exit(struct hid_device* hid)
 {
 	struct hid_ff_logitech *lgff = hid->ff_private;
+	DECLARE_WAITQUEUE(wait, current);
+	int timeout = 5*HZ; /* 5 seconds */
 
 	if (lgff->urbffout) {
 		usb_unlink_urb(lgff->urbffout);
+		
+		set_current_state(TASK_INTERRUPTIBLE);
+		add_wait_queue(&lgff->wait, &wait);
+
+		if (lgff->urbffout->status == -EINPROGRESS)
+			timeout = schedule_timeout(timeout);
+
+		if (!timeout)
+			warn("ff control urb still in use. Unlinking anyway\n");
+
+		set_current_state(TASK_RUNNING);
+		remove_wait_queue(&lgff->wait, &wait);
+
 		usb_free_urb(lgff->urbffout);
 	}
 }
@@ -181,6 +209,7 @@
 {
 	struct hid_ff_logitech *lgff = hid->ff_private;
 	struct lgff_effect *effect = lgff->effects + code;
+	unsigned long flags;
 
 	if (type != EV_FF) return -EINVAL;
 	
@@ -188,13 +217,9 @@
 
 	if (value < 0) return -EINVAL;
 
-	if (value > 0) {
-		set_bit(EFFECT_PLAYING, effect->flags);
-		hid_lgff_make_rumble(hid);
-	} else /* value == 0*/ {
-		clear_bit(EFFECT_PLAYING, effect->flags);
-		hid_lgff_make_rumble(hid);		
-	}
+	spin_lock_irqsave(&lgff->lock, flags);
+	hid_lgff_ctrl_playback(hid, effect, value);
+	spin_unlock_irqrestore(&lgff->lock, flags);
 
 	return 0;
 
@@ -240,22 +265,23 @@
 	dbg("rumble urb submited");
 }
 
+
+/* Erase all effects this process owns */
 static int hid_lgff_flush(struct input_dev *dev, struct file *file)
 {
 	struct hid_device *hid = dev->private;
 	struct hid_ff_logitech *lgff = hid->ff_private;
 	int i;
 
-	/* Erase all effects this process owns */
 	for (i=0; i<dev->ff_effects_max; ++i) {
 
-		if (test_bit(EFFECT_USED, lgff->effects[i].flags) &&
-			current->pid == lgff->effects[i].owner) {
+		/*NOTE: no need to lock here. The only times EFFECT_USED is
+		  modified is when effects are uploaded or when an effect is
+		  erased. But a process cannot close its dev/input/eventX fd
+		  and perform ioctls on the same fd all at the same time */
+		if ( current->pid == lgff->effects[i].owner
+		     && test_bit(EFFECT_USED, lgff->effects[i].flags)) {
 			
-			/* Stop effect */
-			input_report_ff(dev, i, 0);
-
-			/* Free ressources assigned to effect */
 			if (hid_lgff_erase(dev, i))
 				warn("erase effect %d failed\n", i);
 		}
@@ -269,11 +295,14 @@
 {
 	struct hid_device *hid = dev->private;
 	struct hid_ff_logitech *lgff = hid->ff_private;
+	unsigned long flags;
 
 	if (!LGFF_CHECK_OWNERSHIP(id, lgff)) return -EACCES;
 
-	input_report_ff(dev, id, 0);   /* Stop effect */
+	spin_lock_irqsave(&lgff->lock, flags);
+	hid_lgff_ctrl_playback(hid, lgff->effects + id, 0);
 	lgff->effects[id].flags[0] = 0;
+	spin_unlock_irqrestore(&lgff->lock, flags);
 
 	return 0;
 }
@@ -284,14 +313,18 @@
 
 	if (urb->status)
 		warn("hid_irq_ffout status %d received", urb->status);
+
+	wake_up(&((struct hid_ff_logitech *)(hid->ff_private))->wait);
 }
 
-static int hid_lgff_upload_effect(struct input_dev* input, struct ff_effect* effect)
+static int hid_lgff_upload_effect(struct input_dev* input,
+				  struct ff_effect* effect)
 {
 	struct hid_device *hid = input->private;
 	struct hid_ff_logitech *lgff = hid->ff_private;
 	struct lgff_effect new;
 	int id;
+	unsigned long flags;
 	
 	dbg("ioctl rumble");
 
@@ -299,17 +332,26 @@
 
 	if (effect->type != FF_RUMBLE) return -EINVAL;
 
+	spin_lock_irqsave(&lgff->lock, flags);
+
 	if (effect->id == -1) {
 		int i;
 
 		for (i=0; i<LGFF_EFFECTS && test_bit(EFFECT_USED, lgff->effects[i].flags); ++i);
-		if (i >= LGFF_EFFECTS) return -ENOSPC;
+		if (i >= LGFF_EFFECTS) {
+			spin_unlock_irqrestore(&lgff->lock, flags);
+			return -ENOSPC;
+		}
 
 		effect->id = i;
 		lgff->effects[i].owner = current->pid;
+		lgff->effects[i].flags[0] = 0;
 		set_bit(EFFECT_USED, lgff->effects[i].flags);
 	}
-	else if (!LGFF_CHECK_OWNERSHIP(effect->id, lgff)) return -EACCES;
+	else if (!LGFF_CHECK_OWNERSHIP(effect->id, lgff)) {
+		spin_unlock_irqrestore(&lgff->lock, flags);
+		return -EACCES;
+	}
 
 	id = effect->id;
 	new = lgff->effects[id];
@@ -326,8 +368,10 @@
 		/* Changing replay parameters is not allowed (for the time
 		   being) */
 		if (new.replay.delay != lgff->effects[id].replay.delay
-		    || new.replay.length != lgff->effects[id].replay.length)
+		    || new.replay.length != lgff->effects[id].replay.length) {
+			spin_unlock_irqrestore(&lgff->lock, flags);
 			return -ENOSYS;
+		}
 
 		lgff->effects[id] = new;
 		hid_lgff_make_rumble(hid);
@@ -336,7 +380,22 @@
 		lgff->effects[id] = new;
 	}
 
+	spin_unlock_irqrestore(&lgff->lock, flags);
 	return 0;
+}
+
+/* Lock must be held by caller */
+static void hid_lgff_ctrl_playback(struct hid_device *hid,
+				   struct lgff_effect *effect, int play)
+{
+	if (play) {
+		set_bit(EFFECT_PLAYING, effect->flags);
+		hid_lgff_make_rumble(hid);
+
+	} else {
+		clear_bit(EFFECT_PLAYING, effect->flags);
+		hid_lgff_make_rumble(hid);
+	}
 }
 
 #endif /* CONFIG_LOGITECH_RUMBLE */

[Linuxconsole-commit]CVS: ruby/utils remove-obsolete-files,1.28,1.29

From: James S. <jsi...@us...> - 2002-03-14 22:35:59

Update of /cvsroot/linuxconsole/ruby/utils
In directory usw-pr-cvs1:/tmp/cvs-serv15731

Modified Files:
	remove-obsolete-files 
Log Message:
Synced to 2.5.5

Index: remove-obsolete-files
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/utils/remove-obsolete-files,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- remove-obsolete-files	27 Jan 2002 22:22:56 -0000	1.28
+++ remove-obsolete-files	14 Mar 2002 22:35:55 -0000	1.29
@@ -25,35 +25,6 @@
 rm -fv drivers/char/busmouse.c
 rm -fv drivers/char/busmouse.h
 rm -fv drivers/char/dn_keyb.c
-rm -fv drivers/char/joystick/Config.in
-rm -fv drivers/char/joystick/Makefile
-rm -fv drivers/char/joystick/a3d.c
-rm -fv drivers/char/joystick/adi.c
-rm -fv drivers/char/joystick/amijoy.c
-rm -fv drivers/char/joystick/analog.c
-rm -fv drivers/char/joystick/cobra.c
-rm -fv drivers/char/joystick/db9.c
-rm -fv drivers/char/joystick/gamecon.c
-rm -fv drivers/char/joystick/gameport.c
-rm -fv drivers/char/joystick/gf2k.c
-rm -fv drivers/char/joystick/grip.c
-rm -fv drivers/char/joystick/interact.c
-rm -fv drivers/char/joystick/lightning.c
-rm -fv drivers/char/joystick/magellan.c
-rm -fv drivers/char/joystick/ns558.c
-rm -fv drivers/char/joystick/emu10k1-gp.c
-rm -fv drivers/char/joystick/pcigame.c
-rm -fv drivers/char/joystick/serio.c
-rm -fv drivers/char/joystick/serport.c
-rm -fv drivers/char/joystick/sidewinder.c
-rm -fv drivers/char/joystick/spaceball.c
-rm -fv drivers/char/joystick/spaceorb.c
-rm -fv drivers/char/joystick/tmdc.c
-rm -fv drivers/char/joystick/turbografx.c
-rm -fv drivers/char/joystick/warrior.c
-rm -fv drivers/char/joystick/iforce.c
-rm -fv drivers/char/joystick/stinger.c
-rm -fv drivers/char/joystick/cs461x.c
 rm -fv drivers/char/logibusmouse.c
 rm -fv drivers/char/msbusmouse.c
 rm -fv drivers/char/pc110pad.c
@@ -71,18 +42,6 @@
 rm -fv drivers/sbus/char/sunkeymap.map
 rm -fv drivers/sbus/char/sunmouse.c
 rm -fv drivers/sbus/char/sunmouse.h
-rm -fv drivers/usb/evdev.c
-rm -fv drivers/usb/hid-debug.h
-rm -fv drivers/usb/hid.c
-rm -fv drivers/usb/hid.h
-rm -fv drivers/usb/input.c
-rm -fv drivers/usb/joydev.c
-rm -fv drivers/usb/keybdev.c
-rm -fv drivers/usb/mousedev.c
-rm -fv drivers/usb/usbkbd.c
-rm -fv drivers/usb/usbmouse.c
-rm -fv drivers/usb/wacom.c
-rm -fv drivers/usb/wmforce.c
 rm -fv drivers/video/fbcon-afb.c
 rm -fv drivers/video/fbcon-cfb16.c
 rm -fv drivers/video/fbcon-cfb2.c
@@ -138,4 +97,3 @@
 rm -fv include/video/fbcon.h
 rm -fv include/video/font.h
 rm -fv include/video/sbusfb.h
-rmdir drivers/char/joystick

[Linuxconsole-commit]CVS: ruby/linux/Documentation/serial driver,1.1,1.2

From: James S. <jsi...@us...> - 2002-03-14 22:32:53

Update of /cvsroot/linuxconsole/ruby/linux/Documentation/serial
In directory usw-pr-cvs1:/tmp/cvs-serv14110/linux/Documentation/serial

Modified Files:
	driver 
Log Message:
synced to 2.5.5

Index: driver
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/Documentation/serial/driver,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- driver	13 Nov 2001 20:17:41 -0000	1.1
+++ driver	14 Mar 2002 22:32:20 -0000	1.2
@@ -37,7 +37,7 @@
 
 Generally, all locking is done by the core driver, except for the interrupt
 functions.  It is the responsibility of the low level hardware driver to
-perform the necessary locking there using info->lock. (since it is running
+perform the necessary locking there using port->lock. (since it is running
 in an interrupt, you only need to use spin_lock() and spin_unlock() from
 the interrupt handler).
 
@@ -56,6 +56,10 @@
 	If the port does not support this operation, then it should
 	return TIOCSER_TEMT.
 
+	Locking: none.
+	Interrupts: caller dependent.
+	This call must not sleep
+
   set_mctrl(port, mctrl)
 	This function sets the modem control lines for port described
 	by 'port' to the state described by mctrl.  The relevant bits
@@ -68,6 +72,10 @@
 	active.  If the bit is clear, the signal should be driven
 	inactive.
 
+	Locking: port->lock taken.
+	Interrupts: locally disabled.
+	This call must not sleep
+
   get_mctrl(port)
 	Returns the current state of modem control inputs.  The state
 	of the outputs should not be returned, since the core keeps
@@ -81,39 +89,74 @@
 	indicate that the signal is permanently active.  If RI is
 	not available, the signal should not be indicated as active.
 
-  stop_tx(port,from_tty)
+	Locking: none.
+	Interrupts: caller dependent.
+	This call must not sleep
+
+  stop_tx(port,tty_stop)
 	Stop transmitting characters.  This might be due to the CTS
 	line becoming inactive or the tty layer indicating we want
 	to stop transmission.
 
-  start_tx(port,nonempty,from_tty)
+	tty_stop: 1 if this call is due to the TTY layer issuing a
+	          TTY stop to the driver (equiv to rs_stop).
+
+	Locking: none.
+	Interrupts: caller dependent.
+	This call must not sleep
+
+  start_tx(port,tty_start)
 	start transmitting characters.  (incidentally, nonempty will
 	always be nonzero, and shouldn't be used - it will be dropped).
 
+	tty_start: 1 if this call was due to the TTY layer issuing
+	           a TTY start to the driver (equiv to rs_start)
+
+	Locking: port->lock taken.
+	Interrupts: locally disabled.
+	This call must not sleep
+
   stop_rx(port)
 	Stop receiving characters; the port is in the process of
 	being closed.
 
+	Locking: none.
+	Interrupts: caller dependent.
+	This call must not sleep
+
   enable_ms(port)
 	Enable the modem status interrupts.
 
+	Locking: none.
+	Interrupts: caller dependent.
+
   break_ctl(port,ctl)
 	Control the transmission of a break signal.  If ctl is
 	nonzero, the break signal should be transmitted.  The signal
 	should be terminated when another call is made with a zero
 	ctl.
 
-  startup(port,info)
+	Locking: none.
+	Interrupts: caller dependent.
+	This call must not sleep
+
+  startup(port)
 	Grab any interrupt resources and initialise any low level driver
 	state.  Enable the port for reception.  It should not activate
 	RTS nor DTR; this will be done via a separate call to set_mctrl.
 
-  shutdown(port,info)
+	Locking: port_sem taken.
+	Interrupts: globally disabled.
+
+  shutdown(port)
 	Disable the port, disable any break condition that may be in
 	effect, and free any interrupt resources.  It should not disable
 	RTS nor DTR; this will have already been done via a separate
 	call to set_mctrl.
 
+	Locking: port_sem taken.
+	Interrupts: caller dependent.
+
   change_speed(port,cflag,iflag,quot)
 	Change the port parameters, including word length, parity, stop
 	bits.  Update read_status_mask and ignore_status_mask to indicate
@@ -149,6 +192,10 @@
 	Yes		1	1	character received, marked as
 					TTY_PARITY
 
+	Locking: none.
+	Interrupts: caller dependent.
+	This call must not sleep
+
   pm(port,state,oldstate)
 	perform any power management related activities on the specified
 	port.  state indicates the new state (defined by ACPI D0-D3),
@@ -157,15 +204,32 @@
 
 	This function should not be used to grab any resources.
 
+	Locking: none.
+	Interrupts: caller dependent.
+
+  type(port)
+	Return a pointer to a string constant describing the specified
+	port, or return NULL, in which case the string 'unknown' is
+	substituted.
+
+	Locking: none.
+	Interrupts: caller dependent.
+
   release_port(port)
 	Release any memory and IO region resources currently in use by
 	the port.
 
+	Locking: none.
+	Interrupts: caller dependent.
+
   request_port(port)
 	Request any memory and IO region resources required by the port.
 	If any fail, no resources should be registered when this function
 	returns, and it should return -EBUSY on failure.
 
+	Locking: none.
+	Interrupts: caller dependent.
+
   config_port(port,type)
 	Perform any autoconfiguration steps required for the port.  `type`
 	contains a bit mask of the required configuration.  UART_CONFIG_TYPE
@@ -178,13 +242,22 @@
 	This is not necessary on platforms where ports have interrupts
 	internally hard wired (eg, system on a chip implementations).
 
+	Locking: none.
+	Interrupts: caller dependent.
+
   verify_port(port,serinfo)
 	Verify the new serial port information contained within serinfo is
 	suitable for this port type.
 
+	Locking: none.
+	Interrupts: caller dependent.
+
   ioctl(port,cmd,arg)
 	Perform any port specific IOCTLs.  IOCTL commands must be defined
 	using the standard numbering system found in <asm/ioctl.h>
+
+	Locking: none.
+	Interrupts: caller dependent.
 
 
 Other notes

[Linuxconsole-commit]CVS: ruby/linux Makefile,1.46,1.47

From: James S. <jsi...@us...> - 2002-03-14 22:32:52

Update of /cvsroot/linuxconsole/ruby/linux
In directory usw-pr-cvs1:/tmp/cvs-serv14110/linux

Modified Files:
	Makefile 
Log Message:
synced to 2.5.5

Index: Makefile
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/Makefile,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- Makefile	14 Mar 2002 20:02:06 -0000	1.46
+++ Makefile	14 Mar 2002 22:32:19 -0000	1.47
@@ -1,6 +1,6 @@
 VERSION = 2
 PATCHLEVEL = 5
-SUBLEVEL = 4
+SUBLEVEL = 5
 EXTRAVERSION = -ruby
 
 KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
@@ -122,7 +122,7 @@
 NETWORKS	=net/network.o
 
 LIBS		=$(TOPDIR)/lib/lib.a
-SUBDIRS		=kernel lib drivers mm fs net ipc
+SUBDIRS		=kernel lib drivers mm fs net ipc sound
 
 DRIVERS-n :=
 DRIVERS-y :=
@@ -158,7 +158,7 @@
 endif
 
 DRIVERS-$(CONFIG_UART) += drivers/serial/uart.o
-DRIVERS-$(CONFIG_SOUND) += drivers/sound/sounddrivers.o
+DRIVERS-$(CONFIG_SOUND) += sound/sound.o
 DRIVERS-$(CONFIG_PCI) += drivers/pci/driver.o
 DRIVERS-$(CONFIG_MTD) += drivers/mtd/mtdlink.o
 DRIVERS-$(CONFIG_PCMCIA) += drivers/pcmcia/pcmcia.o
@@ -202,7 +202,7 @@
 	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 \
-	drivers/sound/bin2hex drivers/sound/hex2hex \
+	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 \
@@ -223,11 +223,11 @@
 	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 \
-	drivers/sound/*_boot.h drivers/sound/.*.boot \
-	drivers/sound/msndinit.c \
-	drivers/sound/msndperm.c \
-	drivers/sound/pndsperm.c \
-	drivers/sound/pndspini.c \
+	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 \
@@ -344,7 +344,7 @@
 init/do_mounts.o: init/do_mounts.c include/config/MARKER
 	$(CC) $(CFLAGS) $(CFLAGS_KERNEL) $(PROFILING) -c -o $*.o $<
 
-fs lib mm ipc kernel drivers net: dummy
+fs lib mm ipc kernel drivers net sound: dummy
 	$(MAKE) CFLAGS="$(CFLAGS) $(CFLAGS_KERNEL)" $(subst $@, _dir_$@, $@)
 
 TAGS: dummy

[Linuxconsole-commit]CVS: ruby/linux/arch/ppc/platforms apus_setup.c,NONE,1.1 chrp_setup.c,NONE,1.1 gemini_setup.c,NONE,1.1 iSeries_setup.c,NONE,1.1 oak_setup.c,NONE,1.1 pmac_setup.c,NONE,1.1 pplus_setup.c,NONE,1.1 prep_setup.c,NONE,1.1 sandpoint_setup.c,NONE,1.1 spruce_setup.c,NONE,1.1