Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
F
FMC TDC 1ns 5cha - Software
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Wiki
Wiki
image/svg+xml
Discourse
Discourse
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Projects
FMC TDC 1ns 5cha - Software
Commits
8d4f4e40
Commit
8d4f4e40
authored
Nov 12, 2012
by
Samuel Iglesias Gonsálvez
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
tdc: remove trailing whitespaces
Signed-off-by:
Samuel Iglesias Gonsalvez
<
siglesias@igalia.com
>
parent
49357d4b
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
36 additions
and
37 deletions
+36
-37
tdc_regs.h
drivers/hw/tdc_regs.h
+8
-8
tdc-acam.c
drivers/tdc-acam.c
+1
-1
tdc-core.c
drivers/tdc-core.c
+2
-2
tdc-dma.c
drivers/tdc-dma.c
+2
-2
tdc-fmc.c
drivers/tdc-fmc.c
+16
-16
tdc-zio.c
drivers/tdc-zio.c
+7
-8
No files found.
drivers/hw/tdc_regs.h
View file @
8d4f4e40
...
...
@@ -13,8 +13,8 @@
/* Gennum chip register */
#define TDC_PCI_SYS_CFG_SYSTEM
0x800
#define TDC_PCI_CLK_CSR
0x808
#define TDC_PCI_SYS_CFG_SYSTEM 0x800
#define TDC_PCI_CLK_CSR 0x808
/* Gennum core registers for DMA transactions */
...
...
@@ -28,11 +28,11 @@
#define TDC_DMA_NEXT_H_R 0x1C
#define TDC_DMA_ATTRIB_R 0x20
#define TDC_DMA_STAT_IDLE
BIT(0)
#define TDC_DMA_STAT_DONE
BIT(1)
#define TDC_DMA_STAT_BUSY
BIT(2)
#define TDC_DMA_STAT_ERR
BIT(3)
#define TDC_DMA_STAT_ABORT
BIT(4)
#define TDC_DMA_STAT_IDLE BIT(0)
#define TDC_DMA_STAT_DONE BIT(1)
#define TDC_DMA_STAT_BUSY BIT(2)
#define TDC_DMA_STAT_ERR BIT(3)
#define TDC_DMA_STAT_ABORT BIT(4)
/* ACAM GPX chip registers available */
#define TDC_ACAM_CFG_REG_0 0x20000
...
...
@@ -94,7 +94,7 @@
/* IRQ register*/
#define TDC_IRQ_REG 0xA0000
#define TDC_IRQ_STATUS_REG 0xA0004
#define TDC_IRQ_ENABLE_REG
0xA0008
#define TDC_IRQ_ENABLE_REG 0xA0008
#define TDC_IRQ_GNUM_CORE_0 BIT(0)
#define TDC_IRQ_GNUM_CORE_1 BIT(1)
#define TDC_IRQ_TDC_TSTAMP BIT(2)
...
...
drivers/tdc-acam.c
View file @
8d4f4e40
/*
* ACAM support for tdc driver
* ACAM support for tdc driver
*
* Copyright (C) 2012 CERN (http://www.cern.ch)
* Author: Samuel Iglesias Gonsalvez <siglesias@igalia.com>
...
...
drivers/tdc-core.c
View file @
8d4f4e40
/*
* core tdc driver
* core tdc driver
*
* Copyright (C) 2012 CERN (http://www.cern.ch)
* Author: Samuel Iglesias Gonsalvez <siglesias@igalia.com>
...
...
@@ -9,7 +9,7 @@
* version 2 as published by the Free Software Foundation.
*/
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/kernel.h>
#include <linux/module.h>
...
...
drivers/tdc-dma.c
View file @
8d4f4e40
/*
* DMA support for tdc driver
* DMA support for tdc driver
*
* Copyright (C) 2012 CERN (http://www.cern.ch)
* Author: Samuel Iglesias Gonsalvez <siglesias@igalia.com>
...
...
@@ -19,7 +19,7 @@
/*
* tdc_dma_setup -- Setup DMA operation
*
*
* @tdc: pointer to spec_tdc struct of the device
* @src: address to copy the data from (in TDC board)
* @dst: address to copy the data to (in host computer)
...
...
drivers/tdc-fmc.c
View file @
8d4f4e40
/*
* FMC support for tdc driver
* FMC support for tdc driver
*
* Copyright (C) 2012 CERN (http://www.cern.ch)
* Author: Samuel Iglesias Gonsalvez <siglesias@igalia.com>
...
...
@@ -9,7 +9,7 @@
* version 2 as published by the Free Software Foundation.
*/
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/delay.h>
#include <linux/workqueue.h>
...
...
@@ -39,13 +39,13 @@ static struct fmc_gpio tdc_gpio = {
};
static
void
tdc_fmc_gennum_setup_local_clock
(
struct
spec_tdc
*
tdc
,
int
freq
)
{
{
unsigned
int
divot
;
unsigned
int
data
;
/* Setup local clock */
divot
=
800
/
freq
-
1
;
data
=
0xE001F00C
+
(
divot
<<
4
);
data
=
0xE001F00C
+
(
divot
<<
4
);
writel
(
data
,
tdc
->
gn412x_regs
+
TDC_PCI_CLK_CSR
);
}
...
...
@@ -63,13 +63,13 @@ static int tdc_fmc_check_lost_events(u32 curr_wr_ptr, u32 prev_wr_ptr, int *coun
{
u32
dacapo_prev
,
dacapo_curr
;
int
dacapo_diff
,
ptr_diff
=
0
;
dacapo_prev
=
prev_wr_ptr
>>
12
;
dacapo_curr
=
curr_wr_ptr
>>
12
;
curr_wr_ptr
&=
0x00fff
;
/* Pick last 12 bits */
curr_wr_ptr
>>=
4
;
/* Remove last 4 bits. */
curr_wr_ptr
>>=
4
;
/* Remove last 4 bits. */
prev_wr_ptr
&=
0x00fff
;
/* Pick last 12 bits */
prev_wr_ptr
>>=
4
;
/* Remove last 4 bits. */
prev_wr_ptr
>>=
4
;
/* Remove last 4 bits. */
dacapo_diff
=
dacapo_curr
-
dacapo_prev
;
switch
(
dacapo_diff
)
{
...
...
@@ -88,10 +88,10 @@ static int tdc_fmc_check_lost_events(u32 curr_wr_ptr, u32 prev_wr_ptr, int *coun
break
;
default:
/* We lost data for sure. Notify to the user */
*
count
=
TDC_EVENT_BUFFER_SIZE
;
*
count
=
TDC_EVENT_BUFFER_SIZE
;
return
1
;
}
return
0
;
}
...
...
@@ -103,7 +103,7 @@ static inline int tdc_is_valid_pulse_width(struct tdc_event rising, struct tdc_e
/* Check pulse width from smaller to bigger quantities. */
if
(
likely
(
diff
>
124
))
{
/* Valid pulse width (higher or equal to 100 ns) */
return
1
;
return
1
;
}
else
{
diff
=
falling
.
coarse_time
-
rising
.
coarse_time
;
...
...
@@ -142,7 +142,7 @@ static void tdc_fmc_irq_work(struct work_struct *work)
curr_wr_ptr
=
tdc_get_circular_buffer_wr_pointer
(
tdc
);
if
(
curr_wr_ptr
==
tdc
->
wr_pointer
)
goto
dma_out
;
/* No new events happened */
goto
dma_out
;
/* No new events happened */
prev_wr_ptr
=
tdc
->
wr_pointer
;
ret
=
tdc_dma_setup
(
tdc
,
0
,
(
unsigned
long
)
events
,
...
...
@@ -185,7 +185,7 @@ static void tdc_fmc_irq_work(struct work_struct *work)
rd_ptr
=
(
curr_wr_ptr
>>
4
)
&
0x000ff
;
/* The oldest is curr_wr_ptr */
else
rd_ptr
=
(
prev_wr_ptr
>>
4
)
&
0x000ff
;
/* The oldest is prev_wr_ptr */
for
(
;
count
>
0
;
count
--
)
{
tmp_data
=
&
events
[
rd_ptr
];
/* Check which channel to deliver the data */
...
...
@@ -197,7 +197,7 @@ static void tdc_fmc_irq_work(struct work_struct *work)
/* Copy the data as it is a rising edge one */
tdc
->
event
[
chan
].
data
=
*
tmp_data
;
else
{
/* Check pulse width using the falling edge event */
if
(
tdc_is_valid_pulse_width
(
tdc
->
event
[
chan
].
data
,
*
tmp_data
))
{
...
...
@@ -221,7 +221,7 @@ irqreturn_t tdc_fmc_irq_handler(int irq, void *dev_id)
/* Check the source of the interrupt */
irq_code
=
readl
(
fmc
->
base
+
TDC_IRQ_STATUS_REG
);
/* Tstamp threshold or time threshold */
if
((
irq_code
&
TDC_IRQ_TDC_TSTAMP
)
||
(
irq_code
&
TDC_IRQ_TDC_TIME_THRESH
))
{
...
...
@@ -330,12 +330,12 @@ int tdc_fmc_probe(struct fmc_device *dev)
/* Setup GPIO to have IRQ */
dev
->
op
->
gpio_config
(
dev
,
&
tdc_gpio
,
1
);
/* Clear IRQ */
writel
(
0xF
,
tdc
->
base
+
TDC_IRQ_STATUS_REG
);
writel
(
0xF
,
tdc
->
base
+
TDC_IRQ_STATUS_REG
);
/* Request the IRQ */
dev
->
op
->
irq_request
(
dev
,
tdc_fmc_irq_handler
,
"spec-tdc"
,
IRQF_SHARED
);
/* Enable IRQ */
writel
(
0xF
,
tdc
->
base
+
TDC_IRQ_ENABLE_REG
);
return
tdc_zio_register_device
(
tdc
);
}
...
...
drivers/tdc-zio.c
View file @
8d4f4e40
/*
* ZIO support for tdc driver
* ZIO support for tdc driver
*
* Copyright (C) 2012 CERN (http://www.cern.ch)
* Author: Samuel Iglesias Gonsalvez <siglesias@igalia.com>
...
...
@@ -9,7 +9,7 @@
* version 2 as published by the Free Software Foundation.
*/
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/kernel.h>
#include <linux/module.h>
...
...
@@ -280,9 +280,9 @@ static struct zio_driver tdc_zdrv = {
/* Copied from zio-sys.c. This works because ZIO only supports one children */
static
int
__tdc_match_child
(
struct
device
*
dev
,
void
*
data
)
{
//
if (dev->type == &zobj_device_type)
return
1
;
//
return 0;
//
if (dev->type == &zobj_device_type)
return
1
;
//
return 0;
}
int
tdc_zio_register_device
(
struct
spec_tdc
*
tdc
)
...
...
@@ -311,8 +311,8 @@ int tdc_zio_register_device(struct spec_tdc *tdc)
}
dev
=
device_find_child
(
&
tdc
->
hwzdev
->
head
.
dev
,
NULL
,
__tdc_match_child
);
if
(
!
dev
)
{
dev_err
(
&
tdc
->
spec
->
pdev
->
dev
,
"Child device not found!!
\n
"
);
if
(
!
dev
)
{
dev_err
(
&
tdc
->
spec
->
pdev
->
dev
,
"Child device not found!!
\n
"
);
return
-
ENODEV
;
}
tdc
->
zdev
=
to_zio_dev
(
dev
);
...
...
@@ -335,4 +335,3 @@ void tdc_zio_exit(void)
{
zio_unregister_driver
(
&
tdc_zdrv
);
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment