Moved some defines from mf624_SIMULINK.c to dttomf624_SIMULINK.h

to make them better accesible from s-functions.

Signed-off-by: krecmich <krecmich@emotor.felk.cvut.cz>

diff --git a/mf624_SIMULINK.c b/mf624_SIMULINK.c
index 03c1a50759681a048421e70be6cf9c0169a2c951..30f3e9657c18bfc149afb2bcc109a1a9efa29e4b 100644 (file)
--- a/mf624_SIMULINK.c
+++ b/mf624_SIMULINK.c
@@ -36,6 +36,7 @@
 
 /****************************************************************/
 
+mf624_state_t* mfst=NULL;
 
 int bar_mapping_fill(bar_mapping_t *barmap, const char *uio_dev, int map_nr)
 {
@@ -114,30 +115,6 @@ int bar_mapping_setup(bar_mapping_t *barmap, int device_fd)
 
 
 
-static uint32_t dac_channel2reg[] = {
-       [DA0] = DA0_reg,
-       [DA1] = DA1_reg,
-       [DA2] = DA2_reg,
-       [DA3] = DA3_reg,
-       [DA4] = DA4_reg,
-       [DA5] = DA5_reg,
-       [DA6] = DA6_reg,
-       [DA7] = DA7_reg,
-};
-
-static uint32_t adc_channel2reg[] = {
-       [AD0] = ADDATA0_reg,
-       [AD1] = ADDATA1_reg,
-       [AD2] = ADDATA2_reg,
-       [AD3] = ADDATA3_reg,
-       [AD4] = ADDATA4_reg,
-       [AD5] = ADDATA5_reg,
-       [AD6] = ADDATA6_reg,
-       [AD7] = ADDATA7_reg,
-};
-
-
-
 
 mf624_state_t mf624_state;
 

diff --git a/mf624_SIMULINK.h b/mf624_SIMULINK.h
index 019fbce4b53d410d7fd48ed33ce390e06300c187..55e5f3467d5baf231c77a9afbc9eaea807396d9d 100644 (file)
--- a/mf624_SIMULINK.h
+++ b/mf624_SIMULINK.h
@@ -33,6 +33,19 @@
 #define DA6_reg                        0x2C
 #define DA7_reg                        0x2E
 
+/* BAR4 */
+#define CTR0MODE     0x00
+#define CTR1MODE     0x10
+#define CTR2MODE     0x20
+#define CTR3MODE     0x30
+#define CTR4MODE     0x40
+#define CTR0         0x04
+#define CTR1         0x14
+#define CTR2         0x24
+#define CTR3         0x34
+#define CTR4         0x44
+#define CTRXCTRL     0x60
+
 #define GPIOC_DACEN_mask       (1 << 26)
 #define GPIOC_LDAC_mask                (1 << 23)
 #define GPIOC_EOLC_mask                (1 << 17)
@@ -62,9 +75,33 @@ typedef struct mf624_state_t {
        bar_mapping_t bar4;
        int status;
        int ADC_enabled; // Which ADCs are enabled
+    int DOut;
 } mf624_state_t;
 
-extern mf624_state_t mf624_state;
+//extern mf624_state_t mf624_state;
+extern mf624_state_t* mfst;
+
+static uint32_t dac_channel2reg[] = {
+       [DA0] = DA0_reg,
+       [DA1] = DA1_reg,
+       [DA2] = DA2_reg,
+       [DA3] = DA3_reg,
+       [DA4] = DA4_reg,
+       [DA5] = DA5_reg,
+       [DA6] = DA6_reg,
+       [DA7] = DA7_reg,
+};
+
+static uint32_t adc_channel2reg[] = {
+       [AD0] = ADDATA0_reg,
+       [AD1] = ADDATA1_reg,
+       [AD2] = ADDATA2_reg,
+       [AD3] = ADDATA3_reg,
+       [AD4] = ADDATA4_reg,
+       [AD5] = ADDATA5_reg,
+       [AD6] = ADDATA6_reg,
+       [AD7] = ADDATA7_reg,
+};
 
 extern void print_8bin(int nr);