From a1de353e6b8a1c29ed97fae46e8a4aecefbce4a6 Mon Sep 17 00:00:00 2001 From: bushing Date: Sat, 24 Oct 2009 04:30:58 -0700 Subject: [PATCH] merge sdhc header files --- ipc.c | 2 +- irq.c | 2 +- main.c | 2 +- sdhc.c | 3 +- sdhcreg.h => sdhc.h | 52 ++++++++++++++++++++++++++++++++-- sdhcvar.h | 68 --------------------------------------------- sdmmc.c | 3 +- 7 files changed, 54 insertions(+), 78 deletions(-) rename sdhcreg.h => sdhc.h (81%) delete mode 100644 sdhcvar.h diff --git a/ipc.c b/ipc.c index 9daad2d..604aebb 100644 --- a/ipc.c +++ b/ipc.c @@ -22,7 +22,7 @@ Copyright (C) 2009 John Kelley #include "gecko.h" #include "ipc.h" #include "nand.h" -#include "sdhcvar.h" +#include "sdhc.h" #include "sdmmc.h" #include "crypto.h" #include "boot2.h" diff --git a/irq.c b/irq.c index 0af8875..45c857e 100644 --- a/irq.c +++ b/irq.c @@ -17,7 +17,7 @@ Copyright (C) 2009 Andre Heider "dhewg" #include "ipc.h" #include "crypto.h" #include "nand.h" -#include "sdhcvar.h" +#include "sdhc.h" static u32 _alarm_frequency = 0; diff --git a/main.c b/main.c index 60b229f..2a5415b 100644 --- a/main.c +++ b/main.c @@ -15,7 +15,7 @@ Copyright (C) 2009 John Kelley #include "utils.h" #include "start.h" #include "hollywood.h" -#include "sdhcvar.h" +#include "sdhc.h" #include "string.h" #include "memory.h" #include "gecko.h" diff --git a/sdhc.c b/sdhc.c index 6381248..24dd7be 100644 --- a/sdhc.c +++ b/sdhc.c @@ -21,8 +21,7 @@ */ #include "bsdtypes.h" -#include "sdhcreg.h" -#include "sdhcvar.h" +#include "sdhc.h" #include "sdmmc.h" #include "gecko.h" #include "string.h" diff --git a/sdhcreg.h b/sdhc.h similarity index 81% rename from sdhcreg.h rename to sdhc.h index 0bda8b6..1c34aed 100644 --- a/sdhcreg.h +++ b/sdhc.h @@ -1,7 +1,8 @@ -/* $OpenBSD: sdhcreg.h,v 1.4 2006/07/30 17:20:40 fgsch Exp $ */ +/* $OpenBSD: sdhcvar.h,v 1.3 2007/09/06 08:01:01 jsg Exp $ */ /* * Copyright (c) 2006 Uwe Stuehler + * Copyright (c) 2009 Sven Peter * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -16,8 +17,53 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef _SDHCREG_H_ -#define _SDHCREG_H_ +#ifndef _SDHCVAR_H_ +#define _SDHCVAR_H_ + +#include "bsdtypes.h" +#ifdef CAN_HAZ_IPC +#include "ipc.h" +#endif + +#define SDHC_MAX_HOSTS 4 + +struct sdhc_host { + struct sdhc_softc *sc; /* host controller device */ + struct device *sdmmc; /* generic SD/MMC device */ + bus_space_tag_t iot; /* host register set tag */ + bus_space_handle_t ioh; /* host register set handle */ + u_int clkbase; /* base clock frequency in KHz */ + int maxblklen; /* maximum block length */ + int flags; /* flags for this host */ + u_int32_t ocr; /* OCR value from capabilities */ + u_int8_t regs[14]; /* host controller state */ + u_int16_t intr_status; /* soft interrupt status */ + u_int16_t intr_error_status; /* soft error status */ + int data_command; +}; + +struct sdhc_softc { + struct device sc_dev; + struct sdhc_host sc_host[SDHC_MAX_HOSTS]; + int sc_nhosts; + u_int sc_flags; +}; + + +/* Host controller functions called by the attachment driver. */ +int sdhc_host_found(struct sdhc_softc *, bus_space_tag_t, + bus_space_handle_t, int); +void sdhc_power(int, void *); +void sdhc_shutdown(void *); +int sdhc_intr(void *); +void sdhc_init(void); +void sdhc_exit(void); +void sdhc_irq(void); +#ifdef CAN_HAZ_IPC +void sdhc_ipc(volatile ipc_request *req); +#endif +/* flag values */ +#define SDHC_F_NOPWR0 (1 << 0) /* Host standard register set */ #define SDHC_DMA_ADDR 0x00 diff --git a/sdhcvar.h b/sdhcvar.h deleted file mode 100644 index 3398d09..0000000 --- a/sdhcvar.h +++ /dev/null @@ -1,68 +0,0 @@ -/* $OpenBSD: sdhcvar.h,v 1.3 2007/09/06 08:01:01 jsg Exp $ */ - -/* - * Copyright (c) 2006 Uwe Stuehler - * Copyright (c) 2009 Sven Peter - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -#ifndef _SDHCVAR_H_ -#define _SDHCVAR_H_ - -#include "bsdtypes.h" -#ifdef CAN_HAZ_IPC -#include "ipc.h" -#endif - -#define SDHC_MAX_HOSTS 4 - -struct sdhc_host { - struct sdhc_softc *sc; /* host controller device */ - struct device *sdmmc; /* generic SD/MMC device */ - bus_space_tag_t iot; /* host register set tag */ - bus_space_handle_t ioh; /* host register set handle */ - u_int clkbase; /* base clock frequency in KHz */ - int maxblklen; /* maximum block length */ - int flags; /* flags for this host */ - u_int32_t ocr; /* OCR value from capabilities */ - u_int8_t regs[14]; /* host controller state */ - u_int16_t intr_status; /* soft interrupt status */ - u_int16_t intr_error_status; /* soft error status */ - int data_command; -}; - -struct sdhc_softc { - struct device sc_dev; - struct sdhc_host sc_host[SDHC_MAX_HOSTS]; - int sc_nhosts; - u_int sc_flags; -}; - - -/* Host controller functions called by the attachment driver. */ -int sdhc_host_found(struct sdhc_softc *, bus_space_tag_t, - bus_space_handle_t, int); -void sdhc_power(int, void *); -void sdhc_shutdown(void *); -int sdhc_intr(void *); -void sdhc_init(void); -void sdhc_exit(void); -void sdhc_irq(void); -#ifdef CAN_HAZ_IPC -void sdhc_ipc(volatile ipc_request *req); -#endif -/* flag values */ -#define SDHC_F_NOPWR0 (1 << 0) - -#endif diff --git a/sdmmc.c b/sdmmc.c index 39ff3a0..c64bada 100644 --- a/sdmmc.c +++ b/sdmmc.c @@ -9,8 +9,7 @@ Copyright (C) 2008, 2009 Sven Peter */ #include "bsdtypes.h" -#include "sdhcreg.h" -#include "sdhcvar.h" +#include "sdhc.h" #include "sdmmc.h" #include "gecko.h" #include "string.h"