diff options
| author | Paul Selkirk <paul@psgd.org> | 2016-07-06 14:29:14 -0400 |
|---|---|---|
| committer | Paul Selkirk <paul@psgd.org> | 2016-07-06 14:29:14 -0400 |
| commit | 6a9c597bc9e6b9183355de8f99ce45611ea97a95 (patch) | |
| tree | 0cbe230d84c009e7f7da94ec027a2b8ab251e1e1 /hal_io_fmc.c | |
| parent | e1c57eff41a57b8a3f16e5d652b5598d75887a21 (diff) | |
Belatedly adjust hal_io_read/write to the new flat addressing architecture.
Diffstat (limited to 'hal_io_fmc.c')
| -rw-r--r-- | hal_io_fmc.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/hal_io_fmc.c b/hal_io_fmc.c index 5742e56..7aa4b19 100644 --- a/hal_io_fmc.c +++ b/hal_io_fmc.c @@ -4,7 +4,7 @@ * This module contains common code to talk to the FPGA over the FMC bus. * * Author: Paul Selkirk - * Copyright (c) 2014-2015, NORDUnet A/S All rights reserved. + * Copyright (c) 2014-2016, NORDUnet A/S All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are @@ -61,17 +61,10 @@ static hal_error_t init(void) } /* Translate cryptech register number to FMC address. - * - * register number format: - * 3 bits segment selector - * 5 bits core selector (6 bits in native eim) - * 8 bits register selector - * - * sss ccccc rrrrrrrr => sss 0 ccccc rrrrrrrr 00 */ static hal_addr_t fmc_offset(hal_addr_t offset) { - return ((offset & ~0x1fff) << 3) + ((offset & 0x1fff) << 2); + return offset << 2; } void hal_io_set_debug(int onoff) |