 4bd802b209
			
		
	
	
		4bd802b209
		
	
	
	
	
		
			
			Clean up includes so that osdep.h is included first and headers
which it implies are not included manually.
This commit was created with scripts/clean-includes, with the changes
to the following files manually reverted:
    contrib/libvhost-user/libvhost-user-glib.h
    contrib/libvhost-user/libvhost-user.c
    contrib/libvhost-user/libvhost-user.h
    contrib/plugins/hotblocks.c
    contrib/plugins/hotpages.c
    contrib/plugins/howvec.c
    contrib/plugins/lockstep.c
    linux-user/mips64/cpu_loop.c
    linux-user/mips64/signal.c
    linux-user/sparc64/cpu_loop.c
    linux-user/sparc64/signal.c
    linux-user/x86_64/cpu_loop.c
    linux-user/x86_64/signal.c
    target/s390x/gen-features.c
    tests/fp/platform.h
    tests/migration/s390x/a-b-bios.c
    tests/plugin/bb.c
    tests/plugin/empty.c
    tests/plugin/insn.c
    tests/plugin/mem.c
    tests/test-rcu-simpleq.c
    tests/test-rcu-slist.c
    tests/test-rcu-tailq.c
    tests/uefi-test-tools/UefiTestToolsPkg/BiosTablesTest/BiosTablesTest.c
contrib/plugins/, tests/plugin/, and tests/test-rcu-slist.c appear not
to include osdep.h intentionally.  The remaining reverts are the same
as in commit bbfff19688d.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20201113061216.2483385-1-armbru@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Acked-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Tested-by: Thomas Huth <thuth@redhat.com>
Acked-by: Cornelia Huck <cohuck@redhat.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Acked-by: Alexander Bulekov <alxndr@bu.edu>
		
	
			
		
			
				
	
	
		
			59 lines
		
	
	
		
			1.2 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			59 lines
		
	
	
		
			1.2 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| /*
 | |
|  * QEMU Motorola 680x0 Macintosh Video Card Emulation
 | |
|  *                 Copyright (c) 2012-2018 Laurent Vivier
 | |
|  *
 | |
|  * some parts from QEMU G364 framebuffer Emulator.
 | |
|  *                 Copyright (c) 2007-2011 Herve Poussineau
 | |
|  *
 | |
|  * This work is licensed under the terms of the GNU GPL, version 2 or later.
 | |
|  * See the COPYING file in the top-level directory.
 | |
|  *
 | |
|  */
 | |
| 
 | |
| #ifndef MACFB_H
 | |
| #define MACFB_H
 | |
| 
 | |
| #include "exec/memory.h"
 | |
| #include "ui/console.h"
 | |
| #include "qom/object.h"
 | |
| 
 | |
| typedef struct MacfbState {
 | |
|     MemoryRegion mem_vram;
 | |
|     MemoryRegion mem_ctrl;
 | |
|     QemuConsole *con;
 | |
| 
 | |
|     uint8_t *vram;
 | |
|     uint32_t vram_bit_mask;
 | |
|     uint32_t palette_current;
 | |
|     uint8_t color_palette[256 * 3];
 | |
|     uint32_t width, height; /* in pixels */
 | |
|     uint8_t depth;
 | |
| } MacfbState;
 | |
| 
 | |
| #define TYPE_MACFB "sysbus-macfb"
 | |
| OBJECT_DECLARE_SIMPLE_TYPE(MacfbSysBusState, MACFB)
 | |
| 
 | |
| struct MacfbSysBusState {
 | |
|     SysBusDevice busdev;
 | |
| 
 | |
|     MacfbState macfb;
 | |
| };
 | |
| 
 | |
| #define TYPE_NUBUS_MACFB "nubus-macfb"
 | |
| OBJECT_DECLARE_TYPE(MacfbNubusState, MacfbNubusDeviceClass, NUBUS_MACFB)
 | |
| 
 | |
| struct MacfbNubusDeviceClass {
 | |
|     DeviceClass parent_class;
 | |
| 
 | |
|     DeviceRealize parent_realize;
 | |
| };
 | |
| 
 | |
| 
 | |
| struct MacfbNubusState {
 | |
|     NubusDevice busdev;
 | |
| 
 | |
|     MacfbState macfb;
 | |
| };
 | |
| 
 | |
| #endif
 |