* 2.4.28-rc1, more lost patches [1/10]
@ 2004-10-27 9:29 sezeroz
0 siblings, 0 replies; 4+ messages in thread
From: sezeroz @ 2004-10-27 9:29 UTC (permalink / raw)
To: linux-kernel; +Cc: marcelo.tosatti
[-- Attachment #1: Type: text/plain, Size: 135 bytes --]
Here are more lost patches for re-review for 2.4.28.
Mostly from -ac tree.
Regards,
O. Sezer
[1/10] ricoh.h, mem0 wrong definition.
[-- Attachment #2: ricoh_mem0_definition.patch --]
[-- Type: application/octet-stream, Size: 555 bytes --]
Already in 2.6
diff -urN 28rc1/drivers/pcmcia/ricoh.h 28rc1_aac/drivers/pcmcia/ricoh.h
--- 28rc1/drivers/pcmcia/ricoh.h 2003-06-13 17:51:35.000000000 +0300
+++ 28rc1_aac/drivers/pcmcia/ricoh.h 2004-10-24 00:58:10.000000000 +0300
@@ -109,7 +109,7 @@
/* 16-bit IO and memory timing registers */
#define RL5C4XX_16BIT_IO_0 0x0088 /* 16 bit */
-#define RL5C4XX_16BIT_MEM_0 0x0088 /* 16 bit */
+#define RL5C4XX_16BIT_MEM_0 0x008a /* 16 bit */
#define RL5C4XX_SETUP_MASK 0x0007
#define RL5C4XX_SETUP_SHIFT 0
#define RL5C4XX_CMD_MASK 0x01f0
^ permalink raw reply [flat|nested] 4+ messages in thread
* 2.4.28-rc1, more lost patches [1/10]
@ 2004-10-27 9:42 sezeroz
0 siblings, 0 replies; 4+ messages in thread
From: sezeroz @ 2004-10-27 9:42 UTC (permalink / raw)
To: linux-kernel; +Cc: marcelo.tosatti
[-- Attachment #1: Type: text/plain, Size: 50 bytes --]
[7/10] ide-scsi v0.94 from -ac/redhat. (By ???)
[-- Attachment #2: ide-scsi_v0.94.patch --]
[-- Type: application/octet-stream, Size: 2455 bytes --]
from in -ac/redhat.
diff -urN 28rc1/drivers/scsi/ide-scsi.c 28rc1_aac/drivers/scsi/ide-scsi.c
--- 28rc1/drivers/scsi/ide-scsi.c 2003-11-28 20:26:20.000000000 +0200
+++ 28rc1_aac/drivers/scsi/ide-scsi.c 2004-10-24 00:58:11.000000000 +0300
@@ -1,5 +1,5 @@
/*
- * linux/drivers/scsi/ide-scsi.c Version 0.93 June 10, 2002
+ * linux/drivers/scsi/ide-scsi.c Version 0.94 Sept 09, 2003
*
* Copyright (C) 1996 - 1999 Gadi Oxman <gadio@netvision.net.il>
* Copyright (C) 2001 - 2002 Andre Hedrick <andre@linux-ide.org>
@@ -35,9 +35,12 @@
* Ver 0.92 Mar 21 02 Include DevFs support
* Borsenkow Andrej <Andrej.Borsenkow@mow.siemens.ru>
* Ver 0.93 Jun 10 02 Fix "off by one" error in transforms
+ * Ver 0.94 Sep 09 03 Added transform for reading ATAPI tape drive block
+ * limits (ATAPI tapes report block limits in mode
+ * page 0x2A, not by "read block limits" command)
*/
-#define IDESCSI_VERSION "0.93"
+#define IDESCSI_VERSION "0.94"
#include <linux/module.h>
#include <linux/config.h>
@@ -234,6 +237,25 @@
pc->buffer_size += 4;
}
}
+ if (drive->media == ide_tape) {
+ if (sc[0] == READ_BLOCK_LIMITS) { /* IDE tapes have blk lmts in mode page 0x2a */
+ if (!scsi_buf)
+ return;
+ /* buffer size should be 6 for READ_BLOCK_LIMITS */
+ /* we need 12 bytes (4 for header + 8 for mode page */
+ if ((atapi_buf = kmalloc(12, GFP_ATOMIC)) == NULL)
+ return;
+ memset(atapi_buf, 0, 12);
+ memset (c, 0, 12);
+ c[0] = MODE_SENSE;
+ c[1] = 8; /* no block descriptors */
+ c[2] = 0x2A; /* mode page 0x2A */
+ c[4] = 12; /* buffer length 12 decimal */
+ pc->buffer = atapi_buf;
+ pc->request_transfer = 12;
+ pc->buffer_size = 12;
+ }
+ }
}
static inline void idescsi_transform_pc2 (ide_drive_t *drive, idescsi_pc_t *pc)
@@ -262,7 +284,19 @@
/* response data format */
scsi_buf[3] = (scsi_buf[3] & 0xf0) | 2;
}
+ }
+ if (drive->media == ide_tape) {
+ if (sc[0] == READ_BLOCK_LIMITS) {
+ memset(scsi_buf, 0, pc->scsi_cmd->request_bufflen);
+ /* granularity of 9 (always 9 for ide tapes) */
+ scsi_buf[0] = 9;
+ /* block length of 1024 bytes supported? */
+ scsi_buf[2] = (atapi_buf[11] & 0x04) ? 4 : 2;
+ /* block length of 512 bytes supported? */
+ scsi_buf[4] = (atapi_buf[11] & 0x02) ? 2 : 4;
+ }
}
+
if (atapi_buf && atapi_buf != scsi_buf)
kfree(atapi_buf);
}
^ permalink raw reply [flat|nested] 4+ messages in thread* 2.4.28-rc1, more lost patches [1/10]
@ 2004-10-27 9:51 sezeroz
0 siblings, 0 replies; 4+ messages in thread
From: sezeroz @ 2004-10-27 9:51 UTC (permalink / raw)
To: linux-kernel; +Cc: marcelo.tosatti
[-- Attachment #1: Type: text/plain, Size: 101 bytes --]
[10/10] Krzysztof Halasa: AF_UNIX dgram select problem;
from (only in) -ac/redhat. To be reviewed.
[-- Attachment #2: af_unix-dgram_poll.patch --]
[-- Type: application/octet-stream, Size: 1840 bytes --]
Krzysztof Halasa
first discussion/thread:
http://marc.theaimsgroup.com/?t=105465240900005&r=1&w=2
Patch then posted at:
http://marc.theaimsgroup.com/?l=linux-kernel&m=105560475819610&w=2
No further discussion seems to appear thereafter.
only in ac/redhat, _NOT_ in 2.6
diff -urN 28rc1/net/unix/af_unix.c 28rc1_aac/net/unix/af_unix.c
--- 28rc1/net/unix/af_unix.c 2002-11-29 01:53:16.000000000 +0200
+++ 28rc1_aac/net/unix/af_unix.c 2004-10-24 00:58:12.000000000 +0300
@@ -1707,6 +1707,39 @@
return err;
}
+static unsigned int dgram_poll(struct file * file, struct socket *sock,
+ poll_table *wait)
+{
+ struct sock *sk = sock->sk;
+ unsigned int mask;
+ unix_socket *other;
+
+ poll_wait(file, sk->sleep, wait);
+ mask = 0;
+
+ /* exceptional events? */
+ if (sk->err || !skb_queue_empty(&sk->error_queue))
+ mask |= POLLERR;
+ if (sk->shutdown == SHUTDOWN_MASK)
+ mask |= POLLHUP;
+
+ /* readable? */
+ if (!skb_queue_empty(&sk->receive_queue) ||
+ (sk->shutdown & RCV_SHUTDOWN))
+ mask |= POLLIN | POLLRDNORM;
+
+ /* writable? */
+ other = unix_peer_get(sk);
+ if (sock_writeable(sk) &&
+ (other == NULL ||
+ skb_queue_len(&other->receive_queue) <= other->max_ack_backlog))
+ mask |= POLLOUT | POLLWRNORM | POLLWRBAND;
+ else
+ set_bit(SOCK_ASYNC_NOSPACE, &sk->socket->flags);
+
+ return mask;
+}
+
static unsigned int unix_poll(struct file * file, struct socket *sock, poll_table *wait)
{
struct sock *sk = sock->sk;
@@ -1836,7 +1869,7 @@
socketpair: unix_socketpair,
accept: sock_no_accept,
getname: unix_getname,
- poll: datagram_poll,
+ poll: dgram_poll,
ioctl: unix_ioctl,
listen: sock_no_listen,
shutdown: unix_shutdown,
^ permalink raw reply [flat|nested] 4+ messages in thread* 2.4.28-rc1, more lost patches [1/10]
@ 2004-10-27 12:59 O.Sezer
0 siblings, 0 replies; 4+ messages in thread
From: O.Sezer @ 2004-10-27 12:59 UTC (permalink / raw)
To: linux-kernel; +Cc: marcelo.tosatti
[-- Attachment #1: Type: text/plain, Size: 140 bytes --]
(Resending to fix binary attachment)
[10/10] Krzysztof Halasa: AF_UNIX dgram select problem;
from (only in) -ac/redhat. To be reviewed.
[-- Attachment #2: af_unix-dgram_poll.patch --]
[-- Type: text/plain, Size: 1840 bytes --]
Krzysztof Halasa
first discussion/thread:
http://marc.theaimsgroup.com/?t=105465240900005&r=1&w=2
Patch then posted at:
http://marc.theaimsgroup.com/?l=linux-kernel&m=105560475819610&w=2
No further discussion seems to appear thereafter.
only in ac/redhat, _NOT_ in 2.6
diff -urN 28rc1/net/unix/af_unix.c 28rc1_aac/net/unix/af_unix.c
--- 28rc1/net/unix/af_unix.c 2002-11-29 01:53:16.000000000 +0200
+++ 28rc1_aac/net/unix/af_unix.c 2004-10-24 00:58:12.000000000 +0300
@@ -1707,6 +1707,39 @@
return err;
}
+static unsigned int dgram_poll(struct file * file, struct socket *sock,
+ poll_table *wait)
+{
+ struct sock *sk = sock->sk;
+ unsigned int mask;
+ unix_socket *other;
+
+ poll_wait(file, sk->sleep, wait);
+ mask = 0;
+
+ /* exceptional events? */
+ if (sk->err || !skb_queue_empty(&sk->error_queue))
+ mask |= POLLERR;
+ if (sk->shutdown == SHUTDOWN_MASK)
+ mask |= POLLHUP;
+
+ /* readable? */
+ if (!skb_queue_empty(&sk->receive_queue) ||
+ (sk->shutdown & RCV_SHUTDOWN))
+ mask |= POLLIN | POLLRDNORM;
+
+ /* writable? */
+ other = unix_peer_get(sk);
+ if (sock_writeable(sk) &&
+ (other == NULL ||
+ skb_queue_len(&other->receive_queue) <= other->max_ack_backlog))
+ mask |= POLLOUT | POLLWRNORM | POLLWRBAND;
+ else
+ set_bit(SOCK_ASYNC_NOSPACE, &sk->socket->flags);
+
+ return mask;
+}
+
static unsigned int unix_poll(struct file * file, struct socket *sock, poll_table *wait)
{
struct sock *sk = sock->sk;
@@ -1836,7 +1869,7 @@
socketpair: unix_socketpair,
accept: sock_no_accept,
getname: unix_getname,
- poll: datagram_poll,
+ poll: dgram_poll,
ioctl: unix_ioctl,
listen: sock_no_listen,
shutdown: unix_shutdown,
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2004-10-27 13:04 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2004-10-27 9:29 2.4.28-rc1, more lost patches [1/10] sezeroz
-- strict thread matches above, loose matches on Subject: below --
2004-10-27 9:42 sezeroz
2004-10-27 9:51 sezeroz
2004-10-27 12:59 O.Sezer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox