merge sdhc header files

This commit is contained in:
bushing 2009-10-24 04:30:58 -07:00
parent f9e873115c
commit a1de353e6b
7 changed files with 54 additions and 78 deletions

2
ipc.c
View File

@ -22,7 +22,7 @@ Copyright (C) 2009 John Kelley <wiidev@kelley.ca>
#include "gecko.h" #include "gecko.h"
#include "ipc.h" #include "ipc.h"
#include "nand.h" #include "nand.h"
#include "sdhcvar.h" #include "sdhc.h"
#include "sdmmc.h" #include "sdmmc.h"
#include "crypto.h" #include "crypto.h"
#include "boot2.h" #include "boot2.h"

2
irq.c
View File

@ -17,7 +17,7 @@ Copyright (C) 2009 Andre Heider "dhewg" <dhewg@wiibrew.org>
#include "ipc.h" #include "ipc.h"
#include "crypto.h" #include "crypto.h"
#include "nand.h" #include "nand.h"
#include "sdhcvar.h" #include "sdhc.h"
static u32 _alarm_frequency = 0; static u32 _alarm_frequency = 0;

2
main.c
View File

@ -15,7 +15,7 @@ Copyright (C) 2009 John Kelley <wiidev@kelley.ca>
#include "utils.h" #include "utils.h"
#include "start.h" #include "start.h"
#include "hollywood.h" #include "hollywood.h"
#include "sdhcvar.h" #include "sdhc.h"
#include "string.h" #include "string.h"
#include "memory.h" #include "memory.h"
#include "gecko.h" #include "gecko.h"

3
sdhc.c
View File

@ -21,8 +21,7 @@
*/ */
#include "bsdtypes.h" #include "bsdtypes.h"
#include "sdhcreg.h" #include "sdhc.h"
#include "sdhcvar.h"
#include "sdmmc.h" #include "sdmmc.h"
#include "gecko.h" #include "gecko.h"
#include "string.h" #include "string.h"

View File

@ -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 <uwe@openbsd.org> * Copyright (c) 2006 Uwe Stuehler <uwe@openbsd.org>
* Copyright (c) 2009 Sven Peter <svenpeter@gmail.com>
* *
* Permission to use, copy, modify, and distribute this software for any * Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above * 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. * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
#ifndef _SDHCREG_H_ #ifndef _SDHCVAR_H_
#define _SDHCREG_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 */ /* Host standard register set */
#define SDHC_DMA_ADDR 0x00 #define SDHC_DMA_ADDR 0x00

View File

@ -1,68 +0,0 @@
/* $OpenBSD: sdhcvar.h,v 1.3 2007/09/06 08:01:01 jsg Exp $ */
/*
* Copyright (c) 2006 Uwe Stuehler <uwe@openbsd.org>
* Copyright (c) 2009 Sven Peter <svenpeter@gmail.com>
*
* 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

View File

@ -9,8 +9,7 @@ Copyright (C) 2008, 2009 Sven Peter <svenpeter@gmail.com>
*/ */
#include "bsdtypes.h" #include "bsdtypes.h"
#include "sdhcreg.h" #include "sdhc.h"
#include "sdhcvar.h"
#include "sdmmc.h" #include "sdmmc.h"
#include "gecko.h" #include "gecko.h"
#include "string.h" #include "string.h"