patch-2.4.20 linux-2.4.20/drivers/char/drm/mga_drv.h
Next file: linux-2.4.20/drivers/char/drm/mga_state.c
Previous file: linux-2.4.20/drivers/char/drm/mga_dma.c
Back to the patch index
Back to the overall index
- Lines: 36
- Date:
Thu Nov 28 15:53:12 2002
- Orig file:
linux-2.4.19/drivers/char/drm/mga_drv.h
- Orig date:
Mon Aug 27 07:40:33 2001
diff -urN linux-2.4.19/drivers/char/drm/mga_drv.h linux-2.4.20/drivers/char/drm/mga_drv.h
@@ -38,7 +38,7 @@
u32 tail;
int space;
- volatile int wrapped;
+ volatile long wrapped;
volatile u32 *status;
@@ -213,7 +213,7 @@
} else if ( dev_priv->prim.space < \
dev_priv->prim.high_mark ) { \
if ( MGA_DMA_DEBUG ) \
- DRM_INFO( __FUNCTION__": wrap...\n" ); \
+ DRM_INFO( "%s: wrap...\n", __FUNCTION__ ); \
return -EBUSY; \
} \
} \
@@ -224,7 +224,7 @@
if ( test_bit( 0, &dev_priv->prim.wrapped ) ) { \
if ( mga_do_wait_for_idle( dev_priv ) < 0 ) { \
if ( MGA_DMA_DEBUG ) \
- DRM_INFO( __FUNCTION__": wrap...\n" ); \
+ DRM_INFO( "%s: wrap...\n", __FUNCTION__ ); \
return -EBUSY; \
} \
mga_do_dma_wrap_end( dev_priv ); \
@@ -276,7 +276,7 @@
#define FLUSH_DMA() \
do { \
if ( 0 ) { \
- DRM_INFO( __FUNCTION__ ":\n" ); \
+ DRM_INFO( "%s:\n" , __FUNCTION__); \
DRM_INFO( " tail=0x%06x head=0x%06lx\n", \
dev_priv->prim.tail, \
MGA_READ( MGA_PRIMADDRESS ) - \
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)