sw/fw: move acam_gpx.h to common, used by both tdc and fd firmware

3a7fb524 · Dimitris Lampridis · c213888f · 3a7fb524
Commit 3a7fb524 authored Aug 15, 2018 by Dimitris Lampridis
Hide whitespace changes
Inline Side-by-side

Showing with 16 additions and 2 deletions

acam_gpx.h software/firmware/common/hw/acam_gpx.h +16 -2

No files found.
--- a/software/firmware/fd/hw/acam_gpx.h
+++ b/software/firmware/fd/hw/acam_gpx.h
+/*
+ * acam_gpx.h
+ *
+ * Copyright (c) 2012-2013 CERN (http://www.cern.ch)
+ * Author: Tomasz Wlostowski <tomasz.wlostowski@cern.ch>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; version 2 of the License.
+ */
+
 #ifndef __ACAM_GPX_H
 #define __ACAM_GPX_H

+/* ACAM TDC-GPX Register bits definitions */
+
 #define AR0_ROsc (1<<0)
 #define AR0_RiseEn0 (1<<1)
 #define AR0_FallEn0 (1<<2)
@@ -25,8 +38,8 @@
 #define AR2_DelRise2(value) (((value)&0x3)<<(24))
 #define AR2_DelFall2(value) (((value)&0x3)<<(26))

-#define AR3_DelTx(chan, value) (((value)&0x3)<<(5 + (chan -1 ) * 2))
-#define AR3_RaSpeed(chan, value) (((value)&0x3)<<(21 + (chan ) * 2))
+#define AR3_DelTx(chan, value) (((value)&0x3)<<(5 + (chan-1) * 2))
+#define AR3_RaSpeed(chan, value) (((value)&0x3)<<(21 + (chan) * 2))

 #define AR4_RaSpeed(chan, value) (((value)&0x3)<<(10 + (chan-3) * 2))

@@ -86,6 +99,7 @@

 #define AR12_HFifoE (1<<11)
 #define AR12_NotLocked (1<<10)
+#define AR12_StartNU (1<<26)

 #endif