From 9583c099b4a08b49e03f7b461c344b6d277fd262 Mon Sep 17 00:00:00 2001 From: Jesse Barnes Date: Wed, 10 Dec 2008 15:47:28 -0800 Subject: Revert "Merge branch 'modesetting-gem'" This reverts commit 6656db10551bbb8770dd945b6d81d5138521f208. We really just want the libdrm and ioctl bits, not all the driver stuff. --- linux-core/atom-bits.h | 48 ------------------------------------------------ 1 file changed, 48 deletions(-) delete mode 100644 linux-core/atom-bits.h (limited to 'linux-core/atom-bits.h') diff --git a/linux-core/atom-bits.h b/linux-core/atom-bits.h deleted file mode 100644 index f94d2e27..00000000 --- a/linux-core/atom-bits.h +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright 2008 Advanced Micro Devices, Inc. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR - * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, - * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - * OTHER DEALINGS IN THE SOFTWARE. - * - * Author: Stanislaw Skowronek - */ - -#ifndef ATOM_BITS_H -#define ATOM_BITS_H - -static inline uint8_t get_u8(void *bios, int ptr) -{ - return ((unsigned char *)bios)[ptr]; -} -#define U8(ptr) get_u8(ctx->ctx->bios,(ptr)) -#define CU8(ptr) get_u8(ctx->bios,(ptr)) -static inline uint16_t get_u16(void *bios, int ptr) -{ - return get_u8(bios,ptr)|(((uint16_t)get_u8(bios,ptr+1))<<8); -} -#define U16(ptr) get_u16(ctx->ctx->bios,(ptr)) -#define CU16(ptr) get_u16(ctx->bios,(ptr)) -static inline uint32_t get_u32(void *bios, int ptr) -{ - return get_u16(bios,ptr)|(((uint32_t)get_u16(bios,ptr+2))<<16); -} -#define U32(ptr) get_u32(ctx->ctx->bios,(ptr)) -#define CU32(ptr) get_u32(ctx->bios,(ptr)) -#define CSTR(ptr) (((char *)(ctx->bios))+(ptr)) - -#endif -- cgit v1.2.3