 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>
		
	
			
		
			
				
	
	
		
			75 lines
		
	
	
		
			1.4 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			75 lines
		
	
	
		
			1.4 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| /*
 | |
|  * QEMU Macintosh floppy disk controller emulator (SWIM)
 | |
|  *
 | |
|  * Copyright (c) 2014-2018 Laurent Vivier <laurent@vivier.eu>
 | |
|  *
 | |
|  * This work is licensed under the terms of the GNU GPL, version 2.  See
 | |
|  * the COPYING file in the top-level directory.
 | |
|  *
 | |
|  */
 | |
| 
 | |
| #ifndef SWIM_H
 | |
| #define SWIM_H
 | |
| 
 | |
| #include "hw/sysbus.h"
 | |
| #include "qom/object.h"
 | |
| 
 | |
| #define SWIM_MAX_FD            2
 | |
| 
 | |
| typedef struct SWIMCtrl SWIMCtrl;
 | |
| 
 | |
| #define TYPE_SWIM_DRIVE "swim-drive"
 | |
| OBJECT_DECLARE_SIMPLE_TYPE(SWIMDrive, SWIM_DRIVE)
 | |
| 
 | |
| struct SWIMDrive {
 | |
|     DeviceState qdev;
 | |
|     int32_t     unit;
 | |
|     BlockConf   conf;
 | |
| };
 | |
| 
 | |
| #define TYPE_SWIM_BUS "swim-bus"
 | |
| OBJECT_DECLARE_SIMPLE_TYPE(SWIMBus, SWIM_BUS)
 | |
| 
 | |
| struct SWIMBus {
 | |
|     BusState bus;
 | |
|     struct SWIMCtrl *ctrl;
 | |
| };
 | |
| 
 | |
| typedef struct FDrive {
 | |
|     SWIMCtrl *swimctrl;
 | |
|     BlockBackend *blk;
 | |
|     BlockConf *conf;
 | |
| } FDrive;
 | |
| 
 | |
| struct SWIMCtrl {
 | |
|     MemoryRegion iomem;
 | |
|     FDrive drives[SWIM_MAX_FD];
 | |
|     int mode;
 | |
|     /* IWM mode */
 | |
|     int iwm_switch;
 | |
|     uint16_t regs[8];
 | |
| #define IWM_PH0   0
 | |
| #define IWM_PH1   1
 | |
| #define IWM_PH2   2
 | |
| #define IWM_PH3   3
 | |
| #define IWM_MTR   4
 | |
| #define IWM_DRIVE 5
 | |
| #define IWM_Q6    6
 | |
| #define IWM_Q7    7
 | |
|     uint8_t iwm_data;
 | |
|     uint8_t iwm_mode;
 | |
|     /* SWIM mode */
 | |
|     uint8_t swim_phase;
 | |
|     uint8_t swim_mode;
 | |
|     SWIMBus bus;
 | |
| };
 | |
| 
 | |
| #define TYPE_SWIM "swim"
 | |
| OBJECT_DECLARE_SIMPLE_TYPE(Swim, SWIM)
 | |
| 
 | |
| struct Swim {
 | |
|     SysBusDevice parent_obj;
 | |
|     SWIMCtrl     ctrl;
 | |
| };
 | |
| #endif
 |