From 8f251e8a9d46634be4741f7f1aef3d52fb1b7dba Mon Sep 17 00:00:00 2001 From: Uwe Hermann Date: Fri, 31 Dec 2010 18:18:39 +0100 Subject: Some more file/path restructuring. All #includes now explicitly use the "" format. If you want to get rid of the "libopencm3" prefix in your local project you can add a respective -I entry in your Makefile (not recommended though). All .ld files and .a libs are installed in $(TOOLCHAIN_DIR)/lib directly (as before), but are now renamed to avoid potential conflicts now or in the future. Examples: libopencm3_lpc13xx.a libopencm3_lpc13xx.ld libopencm3_stm32.a libopencm3_stm32.ld --- include/cm3/common.h | 39 --------------------------------- include/cm3/memorymap.h | 58 ------------------------------------------------- 2 files changed, 97 deletions(-) delete mode 100644 include/cm3/common.h delete mode 100644 include/cm3/memorymap.h (limited to 'include/cm3') diff --git a/include/cm3/common.h b/include/cm3/common.h deleted file mode 100644 index a6cfb22..0000000 --- a/include/cm3/common.h +++ /dev/null @@ -1,39 +0,0 @@ -/* - * This file is part of the libopencm3 project. - * - * Copyright (C) 2009 Uwe Hermann - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#ifndef CM3_COMMON_H -#define CM3_COMMON_H - -#include -#include - -/* Type definitions for shorter and nicer code */ -typedef int8_t s8; -typedef int16_t s16; -typedef int32_t s32; -typedef uint8_t u8; -typedef uint16_t u16; -typedef uint32_t u32; - -/* Generic memory-mapped I/O accessor functions */ -#define MMIO8(addr) (*(volatile u8 *)(addr)) -#define MMIO16(addr) (*(volatile u16 *)(addr)) -#define MMIO32(addr) (*(volatile u32 *)(addr)) - -#endif diff --git a/include/cm3/memorymap.h b/include/cm3/memorymap.h deleted file mode 100644 index 6f8b49d..0000000 --- a/include/cm3/memorymap.h +++ /dev/null @@ -1,58 +0,0 @@ -/* - * This file is part of the libopencm3 project. - * - * Copyright (C) 2009 Uwe Hermann - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#ifndef CM3_MEMORYMAP_H -#define CM3_MEMORYMAP_H - -/* --- ARM Cortex-M3 specific definitions ---------------------------------- */ - -/* Private peripheral bus - Internal */ -#define PPBI_BASE 0xE0000000 -#define ITM_BASE (PPBI_BASE + 0x0000) -#define DWT_BASE (PPBI_BASE + 0x1000) -#define FPB_BASE (PPBI_BASE + 0x2000) -/* PPBI_BASE + 0x3000 (0xE000 3000 - 0xE000 DFFF): Reserved */ -#define SCS_BASE (PPBI_BASE + 0xE000) -/* PPBI_BASE + 0xF000 (0xE000 F000 - 0xE003 FFFF): Reserved */ - -/* --- ITM: Instrumentation Trace Macrocell --- */ -/* TODO */ - -/* --- DWT: Data Watchpoint and Trace unit --- */ -/* TODO */ - -/* --- FPB: Flash Patch and Breakpoint unit --- */ -/* TODO */ - -/* --- SCS: System Control Space --- */ - -/* ITR: Interrupt Type Register */ -#define ITR_BASE (SCS_BASE + 0x0000) -/* SYS_TICK: System Timer */ -#define SYS_TICK_BASE (SCS_BASE + 0x0010) -/* NVIC: Nested Vector Interrupt Controller */ -#define NVIC_BASE (SCS_BASE + 0x0100) -/* SCB: System Control Block */ -#define SCB_BASE (SCS_BASE + 0x0D00) -/* STE: Software Trigger Interrupt Register */ -#define STIR_BASE (SCS_BASE + 0x0F00) -/* ID: ID space */ -#define ID_BASE (SCS_BASE + 0x0FD0) - -#endif -- cgit v1.2.3