[Gc-linux-cvs] linux/drivers/block gc_aram.c,1.4,1.5

[<ham...@us...>]

Update of /cvsroot/gc-linux/linux/drivers/block
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31610/linux/drivers/block

Modified Files:
	gc_aram.c 
Log Message:
now with queue lock


Index: gc_aram.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/block/gc_aram.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- gc_aram.c	2 Mar 2004 15:52:41 -0000	1.4
+++ gc_aram.c	4 Mar 2004 09:58:20 -0000	1.5
@@ -72,13 +72,9 @@
 #define ARAM_READ				1
 #define ARAM_WRITE				0
 
-int ARAM_DMA_lock = 0;
 
 void ARAM_StartDMA (unsigned long mmAddr, unsigned long arAddr, unsigned long length, unsigned long type)
 {
-	while(ARAM_DMA_lock);
-	ARAM_DMA_lock = 1;
- 	
 	//printk("ARAM DMA copy -> %08x - %08x  - %d  %d\n",mmAddr,arAddr,length,type);
 	
 	AR_DMA_MMADDR_H = mmAddr >> 16;
@@ -90,16 +86,12 @@
 	AR_DMA_CNT_H = (type << 15) | (length >> 16);
 	AR_DMA_CNT_L = length & 0xFFFF;
 	
-	// For security
-	udelay(1000);
-
 	// Without the Break, the While loop loops endless
 	int counter=0;
 	while (AI_DSP_STATUS & 0x200) {
 		counter++;
 		if (counter>0xfffff) break;
 	};
-	ARAM_DMA_lock = 0;
 
 }
 /*
@@ -110,10 +102,13 @@
 static void do_aram_request(request_queue_t *q)
 {
 	struct request *req;
+	blk_stop_queue(q);
+	
 	while ((req = elv_next_request(q)) != NULL) {
 		unsigned long start = req->sector << 9;
 		unsigned long len  = req->current_nr_sectors << 9;
-
+		
+	
 		if (start + len > ARAM_BUFFERSIZE) {
 			printk( KERN_ERR DEVICE_NAME ": bad access: block=%lu, count=%u\n",
 				req->sector, req->current_nr_sectors);
@@ -141,6 +136,9 @@
 		
 		end_request(req, 1);
 	}
+	
+	blk_start_queue(q);
+
 }
 
 
@@ -226,6 +224,7 @@
 	aram_gendisk->queue = aram_queue;
 	set_capacity(aram_gendisk,ARAM_BUFFERSIZE>>9);
 	add_disk(aram_gendisk);
+//	spin_lock_init(aram_lock.queue_lock);
 	
 	#ifdef RAMDISK
 	RAMDISKBuffer = kmalloc(ARAM_BUFFERSIZE,GFP_KERNEL);