ChangeSet 1.1504.2.28, 2003/12/09 12:10:22-08:00, [EMAIL PROTECTED]
[PATCH] USB storage: remove the raw_bulk.c and raw_bulk.h files as they are no longer
needed.
drivers/usb/storage/raw_bulk.c | 116 -----------------------------------------
drivers/usb/storage/raw_bulk.h | 20 -------
2 files changed, 136 deletions(-)
diff -Nru a/drivers/usb/storage/raw_bulk.c b/drivers/usb/storage/raw_bulk.c
--- a/drivers/usb/storage/raw_bulk.c Mon Dec 29 14:23:52 2003
+++ /dev/null Wed Dec 31 16:00:00 1969
@@ -1,116 +0,0 @@
-/*
- * Common routines for a handful of drivers.
- * Unrelated to CF/SM - just scatter-gather stuff.
- */
-
-#include "usb.h"
-#include "raw_bulk.h"
-
-/*
- * The routines below convert scatter-gather to single buffer.
- * Some drivers claim this is necessary.
- * Nothing is done when use_sg is zero.
- */
-
-/*
- * Copy from scatter-gather buffer into a newly allocated single buffer,
- * starting at a given index and offset.
- * When done, update index and offset.
- * Return a pointer to the single buffer.
- */
-unsigned char *
-us_copy_from_sgbuf(unsigned char *content, int len,
- int *index, int *offset, int use_sg) {
- struct scatterlist *sg;
- unsigned char *buffer;
- int transferred, i;
-
- if (!use_sg)
- return content;
-
- sg = (struct scatterlist *)content;
- buffer = kmalloc(len, GFP_NOIO);
- if (buffer == NULL)
- return NULL;
-
- transferred = 0;
- i = *index;
- while (i < use_sg && transferred < len) {
- unsigned char *ptr;
- unsigned int length, room;
-
- ptr = sg_address(sg[i]) + *offset;
-
- room = sg[i].length - *offset;
- length = len - transferred;
- if (length > room)
- length = room;
-
- memcpy(buffer+transferred, ptr, length);
- transferred += length;
- *offset += length;
- if (length == room) {
- i++;
- *offset = 0;
- }
- }
- *index = i;
-
- return buffer;
-}
-
-unsigned char *
-us_copy_from_sgbuf_all(unsigned char *content, int len, int use_sg) {
- int index, offset;
-
- index = offset = 0;
- return us_copy_from_sgbuf(content, len, &index, &offset, use_sg);
-}
-
-/*
- * Copy from a single buffer into a scatter-gather buffer,
- * starting at a given index and offset.
- * When done, update index and offset.
- */
-void
-us_copy_to_sgbuf(unsigned char *buffer, int buflen,
- void *content, int *index, int *offset, int use_sg) {
- struct scatterlist *sg;
- int i, transferred;
-
- if (!use_sg)
- return;
-
- transferred = 0;
- sg = content;
- i = *index;
- while (i < use_sg && transferred < buflen) {
- unsigned char *ptr;
- unsigned int length, room;
-
- ptr = sg_address(sg[i]) + *offset;
-
- room = sg[i].length - *offset;
- length = buflen - transferred;
- if (length > room)
- length = room;
-
- memcpy(ptr, buffer+transferred, length);
- transferred += length;
- *offset += length;
- if (length == room) {
- i++;
- *offset = 0;
- }
- }
- *index = i;
-}
-
-void
-us_copy_to_sgbuf_all(unsigned char *buffer, int buflen,
- void *content, int use_sg) {
- int index, offset;
-
- index = offset = 0;
- us_copy_to_sgbuf(buffer, buflen, content, &index, &offset, use_sg);
-}
diff -Nru a/drivers/usb/storage/raw_bulk.h b/drivers/usb/storage/raw_bulk.h
--- a/drivers/usb/storage/raw_bulk.h Mon Dec 29 14:23:52 2003
+++ /dev/null Wed Dec 31 16:00:00 1969
@@ -1,20 +0,0 @@
-#ifndef _USB_STORAGE_RAW_BULK_H_
-#define _USB_STORAGE_RAW_BULK_H_
-
-/* scatter-gather */
-extern unsigned char *us_copy_from_sgbuf(
- unsigned char *content, int buflen,
- int *index, int *offset, int use_sg);
-
-extern unsigned char *us_copy_from_sgbuf_all(
- unsigned char *content, int len, int use_sg);
-
-extern void us_copy_to_sgbuf(
- unsigned char *buffer, int buflen,
- void *content, int *index, int *offset, int use_sg);
-
-extern void us_copy_to_sgbuf_all(
- unsigned char *buffer, int buflen,
- void *content, int use_sg);
-
-#endif
-------------------------------------------------------
This SF.net email is sponsored by: IBM Linux Tutorials.
Become an expert in LINUX or just sharpen your skills. Sign up for IBM's
Free Linux Tutorials. Learn everything from the bash shell to sys admin.
Click now! http://ads.osdn.com/?ad_id78&alloc_id371&op=click
_______________________________________________
[EMAIL PROTECTED]
To unsubscribe, use the last form field at:
https://lists.sourceforge.net/lists/listinfo/linux-usb-devel
