Skip to content

Commit 1fee085

Browse files
committed
whitespace
1 parent 59e6eb9 commit 1fee085

File tree

10 files changed

+724
-724
lines changed

10 files changed

+724
-724
lines changed

pciApp/devLibPCI.c

Lines changed: 142 additions & 142 deletions
Large diffs are not rendered by default.

pciApp/devLibPCI.h

Lines changed: 61 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,10 @@ extern "C" {
5353
@endcode
5454
*/
5555
typedef struct {
56-
epicsUInt32 device, vendor;
57-
epicsUInt32 sub_device, sub_vendor;
58-
epicsUInt32 pci_class;
59-
epicsUInt16 revision;
56+
epicsUInt32 device, vendor;
57+
epicsUInt32 sub_device, sub_vendor;
58+
epicsUInt32 pci_class;
59+
epicsUInt16 revision;
6060
} epicsPCIID;
6161

6262
#define DEVPCI_ANY_DEVICE 0x10000
@@ -73,31 +73,31 @@ typedef struct {
7373

7474
#define DEVPCI_DEVICE_ANY() \
7575
{ DEVPCI_ANY_DEVICE, DEVPCI_ANY_VENDOR, \
76-
DEVPCI_ANY_SUBDEVICE, DEVPCI_ANY_SUBVENDOR, \
77-
DEVPCI_ANY_CLASS, DEVPCI_ANY_REVISION }
76+
DEVPCI_ANY_SUBDEVICE, DEVPCI_ANY_SUBVENDOR, \
77+
DEVPCI_ANY_CLASS, DEVPCI_ANY_REVISION }
7878

7979
#define DEVPCI_DEVICE_VENDOR(dev,vend) \
8080
{ dev, vend, DEVPCI_ANY_SUBDEVICE, DEVPCI_ANY_SUBVENDOR, \
81-
DEVPCI_ANY_CLASS, DEVPCI_ANY_REVISION }
81+
DEVPCI_ANY_CLASS, DEVPCI_ANY_REVISION }
8282

8383
#define DEVPCI_DEVICE_VENDOR_CLASS(dev,vend,pclass) \
8484
{ dev, vend, DEVPCI_ANY_SUBDEVICE, DEVPCI_ANY_SUBVENDOR, \
85-
pclass, DEVPCI_ANY_REVISION }
85+
pclass, DEVPCI_ANY_REVISION }
8686

8787
#define DEVPCI_SUBDEVICE_SUBVENDOR(dev,vend,sdev,svend) \
8888
{ dev, vend, sdev, svend, \
89-
DEVPCI_ANY_CLASS, DEVPCI_ANY_REVISION }
89+
DEVPCI_ANY_CLASS, DEVPCI_ANY_REVISION }
9090

9191
#define DEVPCI_SUBDEVICE_SUBVENDOR_CLASS(dev,vend,sdev,svend,revision,pclass) \
9292
{ dev, vend, sdev, svend, \
93-
pclass, revision }
93+
pclass, revision }
9494

9595
#define DEVPCI_NO_SLOT NULL
9696

9797
struct PCIBar {
98-
unsigned int ioport:1; /**< 0 memory, 1 I/O */
99-
unsigned int addr64:1; /**< 0 32 bit, 1 64 bit */
100-
unsigned int below1M:1; /**< 0 Normal, 1 Must be mapped below 1M */
98+
unsigned int ioport:1; /**< 0 memory, 1 I/O */
99+
unsigned int addr64:1; /**< 0 32 bit, 1 64 bit */
100+
unsigned int below1M:1; /**< 0 Normal, 1 Must be mapped below 1M */
101101
};
102102

103103
/** @brief Device token
@@ -110,16 +110,16 @@ struct PCIBar {
110110
*/
111111

112112
typedef struct {
113-
epicsPCIID id; /**< @brief Exact ID of device */
114-
unsigned int bus;
115-
unsigned int device;
116-
unsigned int function;
117-
/*!< Chassis slot "number" identifier (may not be a simple number) or DEVPCI_NO_SLOT if not supported*/
118-
const char* slot;
119-
struct PCIBar bar[6];
120-
epicsUInt8 irq;
121-
unsigned int domain;
122-
const char* driver;
113+
epicsPCIID id; /**< @brief Exact ID of device */
114+
unsigned int bus;
115+
unsigned int device;
116+
unsigned int function;
117+
/*!< Chassis slot "number" identifier (may not be a simple number) or DEVPCI_NO_SLOT if not supported*/
118+
const char* slot;
119+
struct PCIBar bar[6];
120+
epicsUInt8 irq;
121+
unsigned int domain;
122+
const char* driver;
123123
} epicsPCIDevice;
124124

125125
/** @brief The maximum number of base address registers (BARs). */
@@ -153,11 +153,11 @@ typedef int (*devPCISearchFn)(void* ptr,const epicsPCIDevice* dev);
153153
*/
154154
epicsShareFunc
155155
int devPCIFindCB(
156-
const epicsPCIID *idlist,
157-
devPCISearchFn searchfn,
158-
void *arg,
159-
unsigned int opt /* always 0 */
160-
);
156+
const epicsPCIID *idlist,
157+
devPCISearchFn searchfn,
158+
void *arg,
159+
unsigned int opt /* always 0 */
160+
);
161161

162162
/** @brief PCI bus search by specification string
163163
*
@@ -183,7 +183,7 @@ int devPCIFindSpec(
183183
const char *spec,
184184
const epicsPCIDevice **found,
185185
unsigned int opt /* always 0 */
186-
);
186+
);
187187

188188
/** @brief PCI bus probe
189189
*
@@ -205,24 +205,24 @@ int devPCIFindSpec(
205205
*/
206206
epicsShareFunc
207207
int devPCIFindDBDF(
208-
const epicsPCIID *idlist,
209-
unsigned int domain,
210-
unsigned int b,
211-
unsigned int d,
212-
unsigned int f,
213-
const epicsPCIDevice **found,
214-
unsigned int opt /* always 0 */
215-
);
208+
const epicsPCIID *idlist,
209+
unsigned int domain,
210+
unsigned int b,
211+
unsigned int d,
212+
unsigned int f,
213+
const epicsPCIDevice **found,
214+
unsigned int opt /* always 0 */
215+
);
216216

217217
epicsShareFunc
218218
int devPCIFindBDF(
219-
const epicsPCIID *idlist,
220-
unsigned int b,
221-
unsigned int d,
222-
unsigned int f,
223-
const epicsPCIDevice **found,
224-
unsigned int opt /* always 0 */
225-
);
219+
const epicsPCIID *idlist,
220+
unsigned int b,
221+
unsigned int d,
222+
unsigned int f,
223+
const epicsPCIDevice **found,
224+
unsigned int opt /* always 0 */
225+
);
226226

227227
#ifdef __linux__
228228
#define DEVLIB_MAP_UIO1TO1 0
@@ -256,11 +256,11 @@ const epicsPCIDevice **found,
256256
epicsShareFunc
257257
int
258258
devPCIToLocalAddr(
259-
const epicsPCIDevice *id,
260-
unsigned int bar,
259+
const epicsPCIDevice *id,
260+
unsigned int bar,
261261
volatile void **ppLocalAddr,
262-
unsigned int opt /* always 0 */
263-
);
262+
unsigned int opt /* always 0 */
263+
);
264264

265265
/** @brief Find the size of a BAR
266266
*
@@ -279,10 +279,10 @@ devPCIToLocalAddr(
279279
epicsShareFunc
280280
int
281281
devPCIBarLen(
282-
const epicsPCIDevice *id,
283-
unsigned int bar,
284-
epicsUInt32 *len
285-
);
282+
const epicsPCIDevice *id,
283+
unsigned int bar,
284+
epicsUInt32 *len
285+
);
286286

287287
/** @brief Request interrupts for device
288288
*
@@ -304,11 +304,11 @@ devPCIBarLen(
304304
*/
305305
epicsShareFunc
306306
int devPCIConnectInterrupt(
307-
const epicsPCIDevice *id,
308-
void (*pFunction)(void *),
309-
void *parameter,
310-
unsigned int opt /* always 0 */
311-
);
307+
const epicsPCIDevice *id,
308+
void (*pFunction)(void *),
309+
void *parameter,
310+
unsigned int opt /* always 0 */
311+
);
312312

313313
/** @brief Stop receiving interrupts
314314
*
@@ -320,10 +320,10 @@ int devPCIConnectInterrupt(
320320
*/
321321
epicsShareFunc
322322
int devPCIDisconnectInterrupt(
323-
const epicsPCIDevice *id,
324-
void (*pFunction)(void *),
325-
void *parameter
326-
);
323+
const epicsPCIDevice *id,
324+
void (*pFunction)(void *),
325+
void *parameter
326+
);
327327

328328
epicsShareFunc
329329
void

pciApp/devLibPCIImpl.h

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -37,32 +37,32 @@ typedef enum {
3737
#define CFG_ACC_WRITE(mode) ((mode) & 0x10)
3838

3939
typedef struct {
40-
const char *name;
40+
const char *name;
4141

42-
int (*pDevInit)(void);
42+
int (*pDevInit)(void);
4343

44-
int (*pDevFinal)(void);
44+
int (*pDevFinal)(void);
4545

46-
int (*pDevPCIFind)(const epicsPCIID *ids, devPCISearchFn searchfn, void *arg, unsigned int o);
46+
int (*pDevPCIFind)(const epicsPCIID *ids, devPCISearchFn searchfn, void *arg, unsigned int o);
4747

48-
int (*pDevPCIToLocalAddr)(const epicsPCIDevice* dev,unsigned int bar,volatile void **a,unsigned int o);
48+
int (*pDevPCIToLocalAddr)(const epicsPCIDevice* dev,unsigned int bar,volatile void **a,unsigned int o);
4949

50-
int (*pDevPCIBarLen)(const epicsPCIDevice* dev,unsigned int bar,epicsUInt32 *len);
50+
int (*pDevPCIBarLen)(const epicsPCIDevice* dev,unsigned int bar,epicsUInt32 *len);
5151

52-
int (*pDevPCIConnectInterrupt)(const epicsPCIDevice *id,
53-
void (*pFunction)(void *),
54-
void *parameter,
55-
unsigned int opt);
52+
int (*pDevPCIConnectInterrupt)(const epicsPCIDevice *id,
53+
void (*pFunction)(void *),
54+
void *parameter,
55+
unsigned int opt);
5656

57-
int (*pDevPCIDisconnectInterrupt)(const epicsPCIDevice *id,
58-
void (*pFunction)(void *),
59-
void *parameter);
57+
int (*pDevPCIDisconnectInterrupt)(const epicsPCIDevice *id,
58+
void (*pFunction)(void *),
59+
void *parameter);
6060

61-
int (*pDevPCIConfigAccess)(const epicsPCIDevice *id, unsigned offset, void *pArg, devPCIAccessMode mode);
61+
int (*pDevPCIConfigAccess)(const epicsPCIDevice *id, unsigned offset, void *pArg, devPCIAccessMode mode);
6262

63-
/* level 0 enables, higher levels disable - on error a negative value is returned */
64-
int (*pDevPCISwitchInterrupt)(const epicsPCIDevice *id, int level);
65-
ELLNODE node;
63+
/* level 0 enables, higher levels disable - on error a negative value is returned */
64+
int (*pDevPCISwitchInterrupt)(const epicsPCIDevice *id, int level);
65+
ELLNODE node;
6666
} devLibPCI;
6767

6868
epicsShareFunc

0 commit comments

Comments
 (0)