Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c0b04d1b authored by Russell King's avatar Russell King Committed by Russell King
Browse files

[ARM] ecard: Move private ecard junk out of asm/ecard.h 



Move ecard.c private junk from asm/ecard.h to a local header file.

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent e6aeb47d

arch/arm/kernel/ecard.c

+2 −0
Original line number Diff line number Diff line
@@ -51,6 +51,8 @@ 
#include <asm/mach/irq.h>

#include <asm/tlbflush.h>



#include "ecard.h"



#ifndef CONFIG_ARCH_RPC

#define HAVE_EXPMASK

#endif

arch/arm/kernel/ecard.h

0 → 100644
+56 −0
Original line number Diff line number Diff line 
/*

 *  ecard.h

 *

 *  Copyright 2007 Russell King

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */



/* Definitions internal to ecard.c - for it's use only!!

 *

 * External expansion card header as read from the card

 */

struct ex_ecid {

	unsigned char	r_irq:1;

	unsigned char	r_zero:1;

	unsigned char	r_fiq:1;

	unsigned char	r_id:4;

	unsigned char	r_a:1;



	unsigned char	r_cd:1;

	unsigned char	r_is:1;

	unsigned char	r_w:2;

	unsigned char	r_r1:4;



	unsigned char	r_r2:8;



	unsigned char	r_prod[2];



	unsigned char	r_manu[2];



	unsigned char	r_country;



	unsigned char	r_fiqmask;

	unsigned char	r_fiqoff[3];



	unsigned char	r_irqmask;

	unsigned char	r_irqoff[3];

};



/*

 * Chunk directory entry as read from the card

 */

struct ex_chunk_dir {

	unsigned char r_id;

	unsigned char r_len[3];

	unsigned long r_start;

	union {

		char string[256];

		char data[1];

	} d;

#define c_id(x)		((x)->r_id)

#define c_len(x)	((x)->r_len[0]|((x)->r_len[1]<<8)|((x)->r_len[2]<<16))

#define c_start(x)	((x)->r_start)

};

include/asm-arm/ecard.h

+0 −50
Original line number Diff line number Diff line
@@ -224,56 +224,6 @@ ecard_address(struct expansion_card *ec, card_type_t type, card_speed_t speed) 
extern int ecard_request_resources(struct expansion_card *ec);

extern void ecard_release_resources(struct expansion_card *ec);



#ifdef ECARD_C

/* Definitions internal to ecard.c - for it's use only!!

 *

 * External expansion card header as read from the card

 */

struct ex_ecid {

	unsigned char	r_irq:1;

	unsigned char	r_zero:1;

	unsigned char	r_fiq:1;

	unsigned char	r_id:4;

	unsigned char	r_a:1;



	unsigned char	r_cd:1;

	unsigned char	r_is:1;

	unsigned char	r_w:2;

	unsigned char	r_r1:4;



	unsigned char	r_r2:8;



	unsigned char	r_prod[2];



	unsigned char	r_manu[2];



	unsigned char	r_country;



	unsigned char	r_fiqmask;

	unsigned char	r_fiqoff[3];



	unsigned char	r_irqmask;

	unsigned char	r_irqoff[3];

};



/*

 * Chunk directory entry as read from the card

 */

struct ex_chunk_dir {

	unsigned char r_id;

	unsigned char r_len[3];

	unsigned long r_start;

	union {

		char string[256];

		char data[1];

	} d;

#define c_id(x)		((x)->r_id)

#define c_len(x)	((x)->r_len[0]|((x)->r_len[1]<<8)|((x)->r_len[2]<<16))

#define c_start(x)	((x)->r_start)

};



#endif



extern struct bus_type ecard_bus_type;



#define ECARD_DEV(_d)	container_of((_d), struct expansion_card, dev)