On Thu, Jan 03, 2019 at 11:40:30AM +0100, Philippe Mathieu-Daudé wrote: > On 1/3/19 10:11 AM, Stefan Hajnoczi wrote: > > From: Steffen Görtz <cont...@steffen-goertz.de> > > > > Adds a header that provides definitions that are used > > across nRF51 peripherals > > > > Signed-off-by: Steffen Görtz <cont...@steffen-goertz.de> > > Reviewed-by: Stefan Hajnoczi <stefa...@redhat.com> > > Reviewed-by: Peter Maydell <peter.mayd...@linaro.org> > > Signed-off-by: Stefan Hajnoczi <stefa...@redhat.com> > > --- > > include/hw/arm/nrf51.h | 45 ++++++++++++++++++++++++++++++++++++ > > include/hw/char/nrf51_uart.h | 1 - > > hw/arm/nrf51_soc.c | 33 ++++++++++---------------- > > 3 files changed, 57 insertions(+), 22 deletions(-) > > create mode 100644 include/hw/arm/nrf51.h > > > > diff --git a/include/hw/arm/nrf51.h b/include/hw/arm/nrf51.h > > new file mode 100644 > > index 0000000000..175bb6c301 > > --- /dev/null > > +++ b/include/hw/arm/nrf51.h > > @@ -0,0 +1,45 @@ > > +/* > > + * Nordic Semiconductor nRF51 Series SOC Common Defines > > + * > > + * This file hosts generic defines used in various nRF51 peripheral > > devices. > > + * > > + * Reference Manual: http://infocenter.nordicsemi.com/pdf/nRF51_RM_v3.0.pdf > > + * Product Spec: http://infocenter.nordicsemi.com/pdf/nRF51822_PS_v3.1.pdf > > + * > > + * Copyright 2018 Steffen Görtz <cont...@steffen-goertz.de> > > + * > > + * This code is licensed under the GPL version 2 or later. See > > + * the COPYING file in the top-level directory. > > + */ > > + > > +#ifndef NRF51_H > > +#define NRF51_H > > + > > +#define NRF51_FLASH_BASE 0x00000000 > > +#define NRF51_FICR_BASE 0x10000000 > > +#define NRF51_FICR_SIZE 0x00000100 > > +#define NRF51_UICR_BASE 0x10001000 > > +#define NRF51_SRAM_BASE 0x20000000 > > + > > +#define NRF51_IOMEM_BASE 0x40000000 > > +#define NRF51_IOMEM_SIZE 0x20000000 > > + > > +#define NRF51_UART_BASE 0x40002000 > > +#define NRF51_TIMER_BASE 0x40008000 > > +#define NRF51_TIMER_SIZE 0x00001000 > > +#define NRF51_RNG_BASE 0x4000D000 > > +#define NRF51_NVMC_BASE 0x4001E000 > > +#define NRF51_GPIO_BASE 0x50000000 > > + > > +#define NRF51_PRIVATE_BASE 0xF0000000 > > +#define NRF51_PRIVATE_SIZE 0x10000000 > > + > > +#define NRF51_PAGE_SIZE 1024 > > I'd keep this file in hw/arm (not include/...).
This header file avoids duplicating definitions in tests/microbit-test.c. How would you structure it differently? Stefan
signature.asc
Description: PGP signature