nubus: Fix up header split (1ff2775a) · Commits · 戴 / test

include/linux/nubus.h

+23 −4

Original line number	Diff line number	Diff line
		@@ -5,16 +5,28 @@
		Originally written by Alan Cox.

		Hacked to death by C. Scott Ananian and David Huggins-Daines.
		*/

		Some of the constants in here are from the corresponding
		NetBSD/OpenBSD header file, by Allen Briggs. We figured out the
		rest of them on our own. */
		#ifndef LINUX_NUBUS_H
		#define LINUX_NUBUS_H

		#include <asm/nubus.h>
		#include <uapi/linux/nubus.h>

		struct nubus_dir {
		unsigned char *base;
		unsigned char *ptr;
		int done;
		int mask;
		};

		struct nubus_dirent {
		unsigned char *base;
		unsigned char type;
		__u32 data; /* Actually 24 bits used */
		int mask;
		};

		struct nubus_board {
		struct nubus_board* next;
		struct nubus_dev* first_dev;
		@@ -130,4 +142,11 @@ void nubus_get_rsrc_mem(void dest, const struct nubus_dirent dirent,
		unsigned int len);
		void nubus_get_rsrc_str(char dest, const struct nubus_dirent dirent,
		unsigned int maxlen);

		/* Returns a pointer to the "standard" slot space. */
		static inline void *nubus_slot_addr(int slot)
		{
		return (void *)(0xF0000000 \| (slot << 24));
		}

		#endif /* LINUX_NUBUS_H */

+0 −23

Original line number	Diff line number	Diff line
		@@ -221,27 +221,4 @@ enum nubus_display_res_id {
		NUBUS_RESID_SIXTHMODE = 0x0085
		};

		struct nubus_dir
		{
		unsigned char *base;
		unsigned char *ptr;
		int done;
		int mask;
		};

		struct nubus_dirent
		{
		unsigned char *base;
		unsigned char type;
		__u32 data; /* Actually 24bits used */
		int mask;
		};


		/* We'd like to get rid of this eventually. Only daynaport.c uses it now. */
		static inline void *nubus_slot_addr(int slot)
		{
		return (void *)(0xF0000000\|(slot<<24));
		}

		#endif /* _UAPILINUX_NUBUS_H */