PERFORCE change 182480 for review

[Jakub Wojciech Klama]

http://p4web.freebsd.org/@@182480?ac=10

Change 182480 by jceel at jceel on 2010/08/16 19:53:28

	Style improvements.

Affected files ...

.. //depot/projects/soc2010/jceel_dma/sys/arm/conf/DAVINCI#6 edit
.. //depot/projects/soc2010/jceel_dma/sys/dev/gpdma/gpdma.c#4 edit
.. //depot/projects/soc2010/jceel_dma/sys/dev/gpdma/gpdma.h#4 edit

Differences ...

==== //depot/projects/soc2010/jceel_dma/sys/arm/conf/DAVINCI#6 (text+ko) ====

@@ -78,5 +78,5 @@
 device		dvmmc
 
 # DMAE
-device		dmae
+device		gpdma
 device		edma

==== //depot/projects/soc2010/jceel_dma/sys/dev/gpdma/gpdma.c#4 (text+ko) ====

@@ -45,8 +45,8 @@
 #include <dev/gpdma/gpdma_cdev.h>
 #include "gpdma_if.h"
 
+#define	DEBUG
 #undef	DEBUG
-#define	DEBUG
 #ifdef	DEBUG
 #define	debugf(fmt, args...) do { \
 	    printf("gpdma: " fmt "\n", ##args); } while (0)
@@ -82,7 +82,7 @@
 {
 	struct gpdma_mapping *map = (struct gpdma_mapping *)arg;
 
-//	KASSERT(nseg == 1, ("bus_dmamap_load returned nseg != 1"));
+	KASSERT(nseg == 1, ("bus_dmamap_load returned nseg != 1"));
 
 	map->gm_error = error;
 	
@@ -238,10 +238,10 @@
 	struct resource *rv;
 	struct gpdma_engine *engine = gpdma_engine_by_name(name);
 
-#ifdef	DEBUG
-	if (engine == NULL)
+	if (engine == NULL) {
 		debugf("cannot find engine %s\n", name);
-#endif
+		return (NULL);
+	}
 
 	rv = rman_reserve_resource(&engine->de_rman, chno, chno, 1,
 	    RF_ACTIVE, engine->de_dev);
@@ -381,10 +381,10 @@
 	    NULL, NULL, &buf->db_dmatag);
 
 	bus_dmamap_create(buf->db_dmatag, 0, &buf->db_dmamap);
-	
-	printf("gpdma_load_buffer_virt(xfer=%p buffer=%d addr=%p length=%d)\n", xfer, buffer, addr, length);
-	printf("buf=%p map=%p tag=%p\n", buf, buf->db_dmamap, buf->db_dmatag);
-	
+
+	debugf("gpdma_load_buffer_virt(xfer=%p buffer=%d addr=%p length=%d)\n", xfer, buffer, addr, length);
+	debugf("buf=%p map=%p tag=%p\n", buf, buf->db_dmamap, buf->db_dmatag);
+
 	bus_dmamap_load(buf->db_dmatag, buf->db_dmamap, addr, 
 	    length, gpdma_dmamap_load_cb, &map, BUS_DMA_NOWAIT);
 
@@ -410,8 +410,6 @@
 	struct gpdma_mapping map;
 	bus_size_t length = uio->uio_resid;
 
-	printf("gpdma_load_buffer_uio: addr=%p\n", uio->uio_iov->iov_base);
-
 	bus_dma_tag_create(xfer->dt_engine->de_dmatag,
 	    1, 0, BUS_SPACE_MAXADDR, BUS_SPACE_MAXADDR,
 	    NULL, NULL, length, 1, length, BUS_DMA_ALLOCNOW,

==== //depot/projects/soc2010/jceel_dma/sys/dev/gpdma/gpdma.h#4 (text+ko) ====

@@ -97,11 +97,6 @@
 	int				dc_maxlinked;
 };
 
-struct gpdma_engine_cdev {
-	struct cdev *			dec_cdev;
-	LIST_ENTRY(gpdma_engine_cdev)	dec_link;
-};
-
 struct gpdma_buffer {
 	struct gpdma_transfer *	db_transfer;
 	int			db_type;
@@ -129,7 +124,7 @@
 #define	GPDMA_TRANSFER_REPEAT		0x2 /* repeat transfer until cancel */
 #define	GPDMA_TRANSFER_NOINTR		0x4 /* don't generate callbacks */
 #define	GPDMA_TRANSFER_STRIDE_CALLBACK	0x8 /* callback on every stride */
-#define	GPDMA_TRANSFER_STRIDE_SYNC	0x10 /* sync on every stride */
+#define	GPDMA_TRANSFER_STRIDE_STOP	0x10 /* stop on every stride */
 #define	GPDMA_TRANSFER_BLOCKING		0x20 /* block until transfer completed */
 	gpdma_callback_t		dt_callback;
 	void *			dt_callback_arg;