* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <linux/config.h>
#include <linux/ctype.h>
#include <linux/init.h>
#include <linux/module.h>
{
int i;
- for (i = 0; i < ARRAY_SIZE(signal_types); i++) {
+ for (i = 0; i < sizeof(signal_types)/sizeof(signal_types[0]); i++) {
if (type == signal_types[i].value)
return signal_types[i].name;
}
{
int i, len;
- for (i = 0; i < ARRAY_SIZE(signal_types); i++) {
+ for (i = 0; i < sizeof(signal_types)/sizeof(signal_types[0]); i++) {
len = strlen(signal_types[i].name);
if (strncmp(name, signal_types[i].name, len) == 0 &&
(name[len] == '\n' || name[len] == '\0'))
}
static ssize_t
-show_spi_transport_period_helper(char *buf, int period)
+show_spi_transport_period_helper(struct class_device *cdev, char *buf,
+ int period)
{
int len = period_to_str(buf, period);
buf[len++] = '\n';
if (i->f->get_period)
i->f->get_period(starget);
- return show_spi_transport_period_helper(buf, tp->period);
+ return show_spi_transport_period_helper(cdev, buf, tp->period);
}
static ssize_t
struct spi_transport_attrs *tp =
(struct spi_transport_attrs *)&starget->starget_data;
- return show_spi_transport_period_helper(buf, tp->min_period);
+ return show_spi_transport_period_helper(cdev, buf, tp->min_period);
}
static ssize_t
{
struct spi_internal *i = to_spi_internal(sdev->host->transportt);
struct scsi_target *starget = sdev->sdev_target;
- struct Scsi_Host *shost = sdev->host;
int len = sdev->inquiry_len;
/* first set us up for narrow async */
DV_SET(offset, 0);
if (spi_min_period(starget) == 8)
DV_SET(pcomp_en, 1);
}
- /* now that we've done all this, actually check the bus
- * signal type (if known). Some devices are stupid on
- * a SE bus and still claim they can try LVD only settings */
- if (i->f->get_signalling)
- i->f->get_signalling(shost);
- if (spi_signalling(shost) == SPI_SIGNAL_SE ||
- spi_signalling(shost) == SPI_SIGNAL_HVD)
- DV_SET(dt, 0);
/* Do the read only INQUIRY tests */
spi_dv_retrain(sdev, buffer, buffer + sdev->inquiry_len,
spi_dv_device_compare_inquiry);
if (unlikely(scsi_device_get(sdev)))
return;
- buffer = kzalloc(len, GFP_KERNEL);
+ buffer = kmalloc(len, GFP_KERNEL);
if (unlikely(!buffer))
goto out_put;
+ memset(buffer, 0, len);
+
/* We need to verify that the actual device will quiesce; the
* later target quiesce is just a nice to have */
if (unlikely(scsi_device_quiesce(sdev)))
}
EXPORT_SYMBOL(spi_display_xfer_agreement);
-int spi_populate_width_msg(unsigned char *msg, int width)
-{
- msg[0] = EXTENDED_MESSAGE;
- msg[1] = 2;
- msg[2] = EXTENDED_WDTR;
- msg[3] = width;
- return 4;
-}
-EXPORT_SYMBOL_GPL(spi_populate_width_msg);
-
-int spi_populate_sync_msg(unsigned char *msg, int period, int offset)
-{
- msg[0] = EXTENDED_MESSAGE;
- msg[1] = 3;
- msg[2] = EXTENDED_SDTR;
- msg[3] = period;
- msg[4] = offset;
- return 5;
-}
-EXPORT_SYMBOL_GPL(spi_populate_sync_msg);
-
-int spi_populate_ppr_msg(unsigned char *msg, int period, int offset,
- int width, int options)
-{
- msg[0] = EXTENDED_MESSAGE;
- msg[1] = 6;
- msg[2] = EXTENDED_PPR;
- msg[3] = period;
- msg[4] = 0;
- msg[5] = offset;
- msg[6] = width;
- msg[7] = options;
- return 8;
-}
-EXPORT_SYMBOL_GPL(spi_populate_ppr_msg);
-
#ifdef CONFIG_SCSI_CONSTANTS
static const char * const one_byte_msgs[] = {
-/* 0x00 */ "Task Complete", NULL /* Extended Message */, "Save Pointers",
+/* 0x00 */ "Command Complete", NULL, "Save Pointers",
/* 0x03 */ "Restore Pointers", "Disconnect", "Initiator Error",
-/* 0x06 */ "Abort Task Set", "Message Reject", "Nop", "Message Parity Error",
+/* 0x06 */ "Abort", "Message Reject", "Nop", "Message Parity Error",
/* 0x0a */ "Linked Command Complete", "Linked Command Complete w/flag",
-/* 0x0c */ "Target Reset", "Abort Task", "Clear Task Set",
-/* 0x0f */ "Initiate Recovery", "Release Recovery",
-/* 0x11 */ "Terminate Process", "Continue Task", "Target Transfer Disable",
-/* 0x14 */ NULL, NULL, "Clear ACA", "LUN Reset"
+/* 0x0c */ "Bus device reset", "Abort Tag", "Clear Queue",
+/* 0x0f */ "Initiate Recovery", "Release Recovery"
};
static const char * const two_byte_msgs[] = {
/* 0x20 */ "Simple Queue Tag", "Head of Queue Tag", "Ordered Queue Tag",
-/* 0x23 */ "Ignore Wide Residue", "ACA"
+/* 0x23 */ "Ignore Wide Residue"
};
static const char * const extended_msgs[] = {
/* 0x00 */ "Modify Data Pointer", "Synchronous Data Transfer Request",
/* 0x02 */ "SCSI-I Extended Identify", "Wide Data Transfer Request",
-/* 0x04 */ "Parallel Protocol Request", "Modify Bidirectional Data Pointer"
+/* 0x04 */ "Parallel Protocol Request"
};
static void print_nego(const unsigned char *msg, int per, int off, int width)
printk("width = %d ", 8 << msg[width]);
}
-static void print_ptr(const unsigned char *msg, int msb, const char *desc)
-{
- int ptr = (msg[msb] << 24) | (msg[msb+1] << 16) | (msg[msb+2] << 8) |
- msg[msb+3];
- printk("%s = %d ", desc, ptr);
-}
-
int spi_print_msg(const unsigned char *msg)
{
- int len = 1, i;
+ int len = 0, i;
if (msg[0] == EXTENDED_MESSAGE) {
- len = 2 + msg[1];
- if (len == 2)
- len += 256;
+ len = 3 + msg[1];
if (msg[2] < ARRAY_SIZE(extended_msgs))
printk ("%s ", extended_msgs[msg[2]]);
else
(int) msg[2]);
switch (msg[2]) {
case EXTENDED_MODIFY_DATA_POINTER:
- print_ptr(msg, 3, "pointer");
+ printk("pointer = %d", (int) (msg[3] << 24) |
+ (msg[4] << 16) | (msg[5] << 8) | msg[6]);
break;
case EXTENDED_SDTR:
print_nego(msg, 3, 4, 0);
case EXTENDED_PPR:
print_nego(msg, 3, 5, 6);
break;
- case EXTENDED_MODIFY_BIDI_DATA_PTR:
- print_ptr(msg, 3, "out");
- print_ptr(msg, 7, "in");
- break;
default:
for (i = 2; i < len; ++i)
printk("%02x ", msg[i]);
(msg[0] & 0x40) ? "" : "not ",
(msg[0] & 0x20) ? "target routine" : "lun",
msg[0] & 0x7);
+ len = 1;
/* Normal One byte */
} else if (msg[0] < 0x1f) {
- if (msg[0] < ARRAY_SIZE(one_byte_msgs) && one_byte_msgs[msg[0]])
- printk("%s ", one_byte_msgs[msg[0]]);
+ if (msg[0] < ARRAY_SIZE(one_byte_msgs))
+ printk(one_byte_msgs[msg[0]]);
else
printk("reserved (%02x) ", msg[0]);
- } else if (msg[0] == 0x55) {
- printk("QAS Request ");
+ len = 1;
/* Two byte */
} else if (msg[0] <= 0x2f) {
if ((msg[0] - 0x20) < ARRAY_SIZE(two_byte_msgs))
msg[0], msg[1]);
len = 2;
} else
- printk("reserved ");
+ printk("reserved");
return len;
}
EXPORT_SYMBOL(spi_print_msg);
int spi_print_msg(const unsigned char *msg)
{
- int len = 1, i;
+ int len = 0, i;
if (msg[0] == EXTENDED_MESSAGE) {
- len = 2 + msg[1];
- if (len == 2)
- len += 256;
+ len = 3 + msg[1];
for (i = 0; i < len; ++i)
printk("%02x ", msg[i]);
/* Identify */
} else if (msg[0] & 0x80) {
printk("%02x ", msg[0]);
+ len = 1;
/* Normal One byte */
- } else if ((msg[0] < 0x1f) || (msg[0] == 0x55)) {
+ } else if (msg[0] < 0x1f) {
printk("%02x ", msg[0]);
+ len = 1;
/* Two byte */
} else if (msg[0] <= 0x2f) {
printk("%02x %02x", msg[0], msg[1]);
struct scsi_transport_template *
spi_attach_transport(struct spi_function_template *ft)
{
- int count = 0;
- struct spi_internal *i = kzalloc(sizeof(struct spi_internal),
+ struct spi_internal *i = kmalloc(sizeof(struct spi_internal),
GFP_KERNEL);
-
+ int count = 0;
if (unlikely(!i))
return NULL;
+ memset(i, 0, sizeof(struct spi_internal));
+
+
i->t.target_attrs.ac.class = &spi_transport_class.class;
i->t.target_attrs.ac.attrs = &i->attrs[0];
i->t.target_attrs.ac.match = spi_target_match;
git://git.onelab.eu / linux-2.6.git / blobdiff