Commit 3cf5cdbe authored by Alejandro Homs Puron's avatar Alejandro Homs Puron Committed by operator for beamline
Browse files

Doc: formatting: remove extra blank spaces

parent 86eb42f0
...@@ -272,50 +272,50 @@ in */usr/local/bin*: ...@@ -272,50 +272,50 @@ in */usr/local/bin*:
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <fcntl.h> #include <fcntl.h>
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
char *dev, *queue, *p, fname[256], buffer[128]; char *dev, *queue, *p, fname[256], buffer[128];
int fd, len, ret; int fd, len, ret;
long aff; long aff;
if (argc != 4) if (argc != 4)
exit(1); exit(1);
if (!strlen(argv[1]) || !strlen(argv[2]) || !strlen(argv[3])) if (!strlen(argv[1]) || !strlen(argv[2]) || !strlen(argv[3]))
exit(2); exit(2);
dev = argv[1]; dev = argv[1];
queue = argv[2]; queue = argv[2];
errno = 0; errno = 0;
aff = strtol(argv[3], &p, 0); aff = strtol(argv[3], &p, 0);
if (errno || *p) if (errno || *p)
exit(3); exit(3);
len = sizeof(fname); len = sizeof(fname);
ret = snprintf(fname, len, "/sys/class/net/%s/queues/%s/rps_cpus", ret = snprintf(fname, len, "/sys/class/net/%s/queues/%s/rps_cpus",
dev, queue); dev, queue);
if ((ret < 0) || (ret == len)) if ((ret < 0) || (ret == len))
exit(4); exit(4);
len = sizeof(buffer); len = sizeof(buffer);
ret = snprintf(buffer, len, "%016lx", aff); ret = snprintf(buffer, len, "%016lx", aff);
if ((ret < 0) || (ret == len)) if ((ret < 0) || (ret == len))
exit(5); exit(5);
fd = open(fname, O_WRONLY); fd = open(fname, O_WRONLY);
if (fd < 0) if (fd < 0)
exit(6); exit(6);
for (p = buffer; *p; p += ret) for (p = buffer; *p; p += ret)
if ((ret = write(fd, p, strlen(p))) < 0) if ((ret = write(fd, p, strlen(p))) < 0)
exit(7); exit(7);
if (close(fd) < 0) if (close(fd) < 0)
exit(8); exit(8);
return 0; return 0;
} }
lid10eiger1:~ # gcc -Wall -o /tmp/netdev_set_queue_rps_cpus /tmp/netdev_set_queue_rps_cpus.c lid10eiger1:~ # gcc -Wall -o /tmp/netdev_set_queue_rps_cpus /tmp/netdev_set_queue_rps_cpus.c
lid10eiger1:~ # cp /tmp/netdev_set_queue_rps_cpus /usr/local/bin lid10eiger1:~ # cp /tmp/netdev_set_queue_rps_cpus /usr/local/bin
...@@ -379,7 +379,7 @@ variable and force the update *GRUB* configuration file: ...@@ -379,7 +379,7 @@ variable and force the update *GRUB* configuration file:
# /boot/grub/grub.cfg. # /boot/grub/grub.cfg.
# For full documentation of the options in this file, see: # For full documentation of the options in this file, see:
# info -f grub -n 'Simple configuration' # info -f grub -n 'Simple configuration'
GRUB_DEFAULT=0 GRUB_DEFAULT=0
GRUB_TIMEOUT=5 GRUB_TIMEOUT=5
GRUB_DISTRIBUTOR=`lsb_release -i -s 2> /dev/null || echo Debian` GRUB_DISTRIBUTOR=`lsb_release -i -s 2> /dev/null || echo Debian`
......
...@@ -86,7 +86,7 @@ Check that all the keys are identical: ...@@ -86,7 +86,7 @@ Check that all the keys are identical:
lisgeiger1:~/eiger/psi_eiger_500k_024_025/2018-04-01-1828 % md5sum ssh_authorized_keys_beb* lisgeiger1:~/eiger/psi_eiger_500k_024_025/2018-04-01-1828 % md5sum ssh_authorized_keys_beb*
1c183bdaa3a2f27029fca84b9cb3b857 ssh_authorized_keys_beb024 1c183bdaa3a2f27029fca84b9cb3b857 ssh_authorized_keys_beb024
1c183bdaa3a2f27029fca84b9cb3b857 ssh_authorized_keys_beb025 1c183bdaa3a2f27029fca84b9cb3b857 ssh_authorized_keys_beb025
In case the *opid00@lisgeiger1* public key is not included (not the case before), In case the *opid00@lisgeiger1* public key is not included (not the case before),
add them in order to open SSH sessions automatically on the detector modules: add them in order to open SSH sessions automatically on the detector modules:
...@@ -95,7 +95,7 @@ add them in order to open SSH sessions automatically on the detector modules: ...@@ -95,7 +95,7 @@ add them in order to open SSH sessions automatically on the detector modules:
lisgeiger1:~/eiger/psi_eiger_500k_024_025/2018-04-01-1828 % for m in ${EIGER_MODULES}; do \ lisgeiger1:~/eiger/psi_eiger_500k_024_025/2018-04-01-1828 % for m in ${EIGER_MODULES}; do \
ssh -x root@${m} sh -c '"cat >> .ssh/authorized_keys"' < ~/.ssh/id_dsa.pub; \ ssh -x root@${m} sh -c '"cat >> .ssh/authorized_keys"' < ~/.ssh/id_dsa.pub; \
done done
Also check that the SSH public host keys are identical (same Linux image): Also check that the SSH public host keys are identical (same Linux image):
:: ::
...@@ -167,8 +167,8 @@ Backup the current version, and transfer the new version: ...@@ -167,8 +167,8 @@ Backup the current version, and transfer the new version:
lisgeiger1:~/eiger/psi_eiger_500k_024_025/2018-04-01-1828 % for m in ${EIGER_MODULES}; do \ lisgeiger1:~/eiger/psi_eiger_500k_024_025/2018-04-01-1828 % for m in ${EIGER_MODULES}; do \
ssh -x root@${m} "cp executables/$(basename ${eiger_server}) executables/eigerDetectorServer"; \ ssh -x root@${m} "cp executables/$(basename ${eiger_server}) executables/eigerDetectorServer"; \
done done
Check that all is as expected: Check that all is as expected:
:: ::
...@@ -203,7 +203,7 @@ Check that all is as expected: ...@@ -203,7 +203,7 @@ Check that all is as expected:
lisgeiger1:~/eiger/psi_eiger_500k_024_025/2018-04-01-1927 % md5sum md5sum_executables_eigerDetectorServer_beb* lisgeiger1:~/eiger/psi_eiger_500k_024_025/2018-04-01-1927 % md5sum md5sum_executables_eigerDetectorServer_beb*
4168a104e53ee71f763ed5f0e0b43859 md5sum_executables_eigerDetectorServer_beb024.out 4168a104e53ee71f763ed5f0e0b43859 md5sum_executables_eigerDetectorServer_beb024.out
4168a104e53ee71f763ed5f0e0b43859 md5sum_executables_eigerDetectorServer_beb025.out 4168a104e53ee71f763ed5f0e0b43859 md5sum_executables_eigerDetectorServer_beb025.out
Force a filesystem *sync* on each host to make the changes persistent, Force a filesystem *sync* on each host to make the changes persistent,
just before power-cycling: just before power-cycling:
...@@ -213,7 +213,7 @@ just before power-cycling: ...@@ -213,7 +213,7 @@ just before power-cycling:
lisgeiger1:~ % for m in ${EIGER_MODULES}; do \ lisgeiger1:~ % for m in ${EIGER_MODULES}; do \
ssh -x root@${m} sync; \ ssh -x root@${m} sync; \
done done
And finally perform a *paranoid* check after power-cycling the detector: And finally perform a *paranoid* check after power-cycling the detector:
:: ::
...@@ -293,13 +293,13 @@ without the need of pressing the button in the rear panel. The latestversion of ...@@ -293,13 +293,13 @@ without the need of pressing the button in the rear panel. The latestversion of
Run the *eiger_flash* utility to update the FEB left/right and BEB FWs, Run the *eiger_flash* utility to update the FEB left/right and BEB FWs,
as well as the kernel image: as well as the kernel image:
:: ::
lisgeiger1:~ % cd ~/eiger/fw_v20 lisgeiger1:~ % cd ~/eiger/fw_v20
lisgeiger1:~/eiger/fw_v20 % which eiger_flash lisgeiger1:~/eiger/fw_v20 % which eiger_flash
/users/opid00/esrf/sls_detectors/eiger/scripts/eiger_flash /users/opid00/esrf/sls_detectors/eiger/scripts/eiger_flash
lisgeiger1:~/eiger/fw_v20 % md5sum * lisgeiger1:~/eiger/fw_v20 % md5sum *
b2b66c1acae90e3f2b4c4488e99d6b42 beb_copper.bit b2b66c1acae90e3f2b4c4488e99d6b42 beb_copper.bit
f9e6e360cfa696957cf4fd5035bed5e1 beb_fiber.bit f9e6e360cfa696957cf4fd5035bed5e1 beb_fiber.bit
...@@ -308,7 +308,7 @@ as well as the kernel image: ...@@ -308,7 +308,7 @@ as well as the kernel image:
7a988f0e39930bf86d9af9dee060ef04 feb_r_fx30t.bit 7a988f0e39930bf86d9af9dee060ef04 feb_r_fx30t.bit
4bf1f88d376fd9651b45c2b5b2b021eb feb_r_fx70t.bit 4bf1f88d376fd9651b45c2b5b2b021eb feb_r_fx70t.bit
1f27879faa7082f9ed2bb2b24b84ea99 simpleImage.virtex440-eiger-beb-hwid1_local 1f27879faa7082f9ed2bb2b24b84ea99 simpleImage.virtex440-eiger-beb-hwid1_local
lisgeiger1:~/eiger/fw_v20 % eiger_flash -m beb_fiber.bit -l feb_l_fx30t.bit -r feb_r_fx30t.bit -k simpleImage.virtex440-eiger-beb-hwid1_local ${EIGER_MODULES} lisgeiger1:~/eiger/fw_v20 % eiger_flash -m beb_fiber.bit -l feb_l_fx30t.bit -r feb_r_fx30t.bit -k simpleImage.virtex440-eiger-beb-hwid1_local ${EIGER_MODULES}
[beb024] Executing: nc -p 3000 -u beb024 3000 [beb024] Executing: nc -p 3000 -u beb024 3000
[beb025] Executing: nc -p 3000 -u beb025 3000 [beb025] Executing: nc -p 3000 -u beb025 3000
...@@ -367,7 +367,7 @@ as well as the kernel image: ...@@ -367,7 +367,7 @@ as well as the kernel image:
[beb025] Firmware flash finished OK (took 16.2 sec) [beb025] Firmware flash finished OK (took 16.2 sec)
[beb024] Firmware flash finished OK (took 17.3 sec) [beb024] Firmware flash finished OK (took 17.3 sec)
Press any key to quit ... Press any key to quit ...
Showing in the console for the FX30T FW: Showing in the console for the FX30T FW:
:: ::
...@@ -509,7 +509,7 @@ Console output on the FX70T FW: ...@@ -509,7 +509,7 @@ Console output on the FX70T FW:
Compare Compare
XFlash_Lock() XFlash_Lock()
Success Success
.. note:: **To-Do** add a *ManualEthernetConnection* restart in case the modules are not .. note:: **To-Do** add a *ManualEthernetConnection* restart in case the modules are not
directly connected to the backend computer, or just not defined in the directly connected to the backend computer, or just not defined in the
*eiger_flash* utility. *eiger_flash* utility.
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment