@@ -309,14 +309,18 @@ func (dev *Device) configureFromCSV() error {
309
309
}
310
310
311
311
func (dev * Device ) Initialize () error {
312
+ var err error
312
313
if len (dev .cfg .daq .addrs ) != 0 {
313
314
dev .msg .Printf ("initialize rfm sinks: %v" , dev .rfms )
314
315
for i := range dev .rfms {
315
- dev .serveRFM (i , dev .cfg .daq .addrs [i ])
316
+ err = dev .serveRFM (i , dev .cfg .daq .addrs [i ])
317
+ if err != nil {
318
+ return err
319
+ }
316
320
}
317
321
}
318
322
319
- err : = dev .initFPGA ()
323
+ err = dev .initFPGA ()
320
324
if err != nil {
321
325
return fmt .Errorf ("eda: could not initialize FPGA: %w" , err )
322
326
}
@@ -748,7 +752,7 @@ func (dev *Device) initRun(run uint32) error {
748
752
return nil
749
753
}
750
754
751
- func (dev * Device ) serveRFM (i int , addr string ) {
755
+ func (dev * Device ) serveRFM (i int , addr string ) error {
752
756
rfm := dev .rfms [i ]
753
757
dev .msg .Printf (
754
758
"dialing RFM(dif=%d, slot=%d) to %q..." ,
@@ -757,13 +761,13 @@ func (dev *Device) serveRFM(i int, addr string) {
757
761
758
762
conn , err := net .Dial ("tcp" , addr )
759
763
if err != nil {
760
- dev .msg .Printf ("could not connect to %q for rfm=%d: %+v" , addr , rfm , err )
761
- return
764
+ return fmt .Errorf ("could not connect to %q for rfm=%d: %+v" , addr , rfm , err )
762
765
}
763
766
dev .daq .rfm [i ].id = dev .difs [rfm ]
764
767
dev .daq .rfm [i ].slot = rfm
765
768
dev .daq .rfm [i ].sck = conn
766
769
dev .msg .Printf ("dialing RFM(%d) to %q... [ok]" , rfm , addr )
770
+ return nil
767
771
}
768
772
769
773
func (dev * Device ) loop () {
0 commit comments