diff --git a/ports/arm/atomport.c b/ports/arm/atomport.c index 2d6c10b..1b3c38a 100644 --- a/ports/arm/atomport.c +++ b/ports/arm/atomport.c @@ -28,7 +28,6 @@ */ #include "atom.h" #include "atomport.h" -#include "types.h" /* * diff --git a/ports/arm/platforms/qemu_integratorcp/modules.c b/ports/arm/platforms/qemu_integratorcp/modules.c index 3005246..f4ab642 100644 --- a/ports/arm/platforms/qemu_integratorcp/modules.c +++ b/ports/arm/platforms/qemu_integratorcp/modules.c @@ -33,7 +33,7 @@ #include "atomport-private.h" #include "atom.h" #include "atomport.h" -#include "types.h" + /** Imports required by C startup code */ extern unsigned long _end_text, _start_data, _end_data, _start_bss, _end_bss; diff --git a/ports/arm/platforms/qemu_integratorcp/modules.h b/ports/arm/platforms/qemu_integratorcp/modules.h index df84171..c3237e0 100644 --- a/ports/arm/platforms/qemu_integratorcp/modules.h +++ b/ports/arm/platforms/qemu_integratorcp/modules.h @@ -34,9 +34,13 @@ */ #include "atomport.h" -#include "types.h" +/* IO definitions (access restrictions to peripheral registers) */ +#define __I volatile /*!< defines 'read only' permissions */ +#define __O volatile /*!< defines 'write only' permissions */ +#define __IO volatile /*!< defines 'read / write' permissions */ + // ***************************************************************************** // INTEGRATORCP TIMER diff --git a/ports/arm/types.h b/ports/arm/types.h deleted file mode 100644 index 13c4db5..0000000 --- a/ports/arm/types.h +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright (c) 2012, Natie van Rooyen. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. No personal names or organizations' names associated with the - * Atomthreads project may be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE ATOMTHREADS PROJECT AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef __TYPES_H -#define __TYPES_H - -/* IO definitions (access restrictions to peripheral registers) */ -#define __I volatile /*!< defines 'read only' permissions */ -#define __O volatile /*!< defines 'write only' permissions */ -#define __IO volatile /*!< defines 'read / write' permissions */ - -#endif /* __TYPES_H */ -