From 50ed1a7c4d9965f7b2d25f0681b0a40fd4057bcf Mon Sep 17 00:00:00 2001 From: Martyn Welch Date: Tue, 15 Dec 2009 08:43:09 +0000 Subject: [PATCH] --- yaml --- r: 186512 b: refs/heads/master c: 3cb1b8a77402df3091ba7ecaede9b22484bf51b9 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/vme/vme_bridge.h | 32 -------------------------- 2 files changed, 1 insertion(+), 33 deletions(-) diff --git a/[refs] b/[refs] index c60dfe494048..724c7c6bedbf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ead1f3e301e2d886ef89f8d0c82b4d495f2a81c2 +refs/heads/master: 3cb1b8a77402df3091ba7ecaede9b22484bf51b9 diff --git a/trunk/drivers/staging/vme/vme_bridge.h b/trunk/drivers/staging/vme/vme_bridge.h index a64677e0a31a..92e5614ab910 100644 --- a/trunk/drivers/staging/vme/vme_bridge.h +++ b/trunk/drivers/staging/vme/vme_bridge.h @@ -229,36 +229,4 @@ struct vmeArbiterCfg { }; typedef struct vmeArbiterCfg vmeArbiterCfg_t; - -/* - * VMEbus RMW Configuration Data - */ -struct vmeRmwCfg { - unsigned int targetAddrU; /* VME Address (Upper) to trigger RMW cycle */ - unsigned int targetAddr; /* VME Address (Lower) to trigger RMW cycle */ - vme_address_t addrSpace; /* VME Address Space */ - int enableMask; /* Bit mask defining the bits of interest */ - int compareData; /* Data to be compared with the data read */ - int swapData; /* Data written to the VMEbus on success */ - int maxAttempts; /* Maximum times to try */ - int numAttempts; /* Number of attempts before success */ - int reserved; /* For future use */ - -}; -typedef struct vmeRmwCfg vmeRmwCfg_t; - -/* - * VMEbus Location Monitor Arg Structure - */ -struct vmeLmCfg { - unsigned int addrU; /* Location Monitor Address upper */ - unsigned int addr; /* Location Monitor Address lower */ - vme_address_t addrSpace; /* Address Space */ - int userAccessType; /* User/Supervisor Access Type */ - int dataAccessType; /* Data/Program Access Type */ - int lmWait; /* Time to wait for access */ - int lmEvents; /* Lm event mask */ - int reserved; /* For future use */ -}; -typedef struct vmeLmCfg vmeLmCfg_t; #endif