Commit 28ecbaee authored by Paolo Bonzini's avatar Paolo Bonzini

ui: move files to ui/ and include/ui/

Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 2870dc34
......@@ -68,8 +68,7 @@ endif
common-obj-y = $(block-obj-y) blockdev.o blockdev-nbd.o block/
common-obj-y += net/
common-obj-y += qom/
common-obj-y += readline.o console.o cursor.o
common-obj-y += qemu-pixman.o
common-obj-y += readline.o
common-obj-y += $(oslib-obj-y)
common-obj-$(CONFIG_WIN32) += os-win32.o
common-obj-$(CONFIG_POSIX) += os-posix.o
......@@ -78,7 +77,6 @@ common-obj-$(CONFIG_LINUX) += fsdev/
extra-obj-$(CONFIG_LINUX) += fsdev/
common-obj-y += tcg-runtime.o host-utils.o main-loop.o
common-obj-y += input.o
common-obj-y += buffered_file.o migration.o migration-tcp.o
common-obj-y += qemu-char.o #aio.o
common-obj-y += block-migration.o iohandler.o
......
......@@ -21,7 +21,7 @@
#include "qmp-commands.h"
#include "qemu_socket.h"
#include "monitor.h"
#include "console.h"
#include "ui/console.h"
static void hmp_handle_error(Monitor *mon, Error **errp)
{
......
......@@ -23,7 +23,7 @@
*/
#include "hw.h"
#include "adb.h"
#include "console.h"
#include "ui/console.h"
/* debug ADB */
//#define DEBUG_ADB
......
......@@ -11,7 +11,7 @@
*/
#include "ssi.h"
#include "console.h"
#include "ui/console.h"
typedef struct {
SSISlave ssidev;
......
......@@ -32,7 +32,7 @@
#include "hw.h"
#include "isa.h"
#include "console.h"
#include "ui/console.h"
#include "qemu-timer.h"
/* #define DEBUG_SMC */
......
......@@ -19,10 +19,10 @@
*/
#include "qemu-common.h"
#include "console.h"
#include "ui/console.h"
#include "devices.h"
#include "vga_int.h"
#include "pixel_ops.h"
#include "ui/pixel_ops.h"
typedef void (*blizzard_fn_t)(uint8_t *, const uint8_t *, unsigned int);
......
......@@ -20,7 +20,7 @@
#include "qemu-common.h"
#include "qemu-timer.h"
#include "console.h"
#include "ui/console.h"
#include "hid.h"
#include "bt.h"
......
......@@ -28,7 +28,7 @@
*/
#include "hw.h"
#include "pci/pci.h"
#include "console.h"
#include "ui/console.h"
#include "vga_int.h"
#include "loader.h"
......
......@@ -26,7 +26,7 @@
#include "sysbus.h"
#include "escc.h"
#include "qemu-char.h"
#include "console.h"
#include "ui/console.h"
#include "trace.h"
/*
......
......@@ -25,8 +25,8 @@
#include "qemu-common.h"
#include "cpu-all.h"
#include "sysbus.h"
#include "console.h"
#include "pixel_ops.h"
#include "ui/console.h"
#include "ui/pixel_ops.h"
#include "bswap.h"
/* Debug messages configuration */
......
......@@ -18,7 +18,7 @@
*/
#include "hw.h"
#include "console.h"
#include "ui/console.h"
#include "framebuffer.h"
/* Render an image from a shared memory framebuffer. */
......
......@@ -18,8 +18,8 @@
*/
#include "hw.h"
#include "console.h"
#include "pixel_ops.h"
#include "ui/console.h"
#include "ui/pixel_ops.h"
#include "trace.h"
#include "sysbus.h"
......
......@@ -23,7 +23,7 @@
* THE SOFTWARE.
*/
#include "hw.h"
#include "console.h"
#include "ui/console.h"
#include "qemu-timer.h"
#include "hid.h"
......
......@@ -26,7 +26,7 @@
#include "hw.h"
#include "pc.h"
#include "console.h"
#include "ui/console.h"
#include "qemu-timer.h"
#include "hpet_emul.h"
#include "sysbus.h"
......
......@@ -23,8 +23,8 @@
*/
#include "qemu-common.h"
#include "console.h"
#include "pixel_ops.h"
#include "ui/console.h"
#include "ui/pixel_ops.h"
#include "trace.h"
#include "sysbus.h"
......
......@@ -29,7 +29,7 @@
#include "hw/hw.h"
#include "hw/pc.h"
#include "qemu-error.h"
#include "console.h"
#include "ui/console.h"
#include "hw/loader.h"
#include "monitor.h"
#include "range.h"
......
......@@ -21,7 +21,7 @@
#include "hw.h"
#include "i2c.h"
#include "qemu-timer.h"
#include "console.h"
#include "ui/console.h"
typedef struct {
I2CSlave i2c;
......
......@@ -24,7 +24,7 @@
#include "hw.h"
#include "sysbus.h"
#include "trace.h"
#include "console.h"
#include "ui/console.h"
#include "hid.h"
#include "qemu-error.h"
......
......@@ -25,9 +25,9 @@
#include "hw.h"
#include "sysbus.h"
#include "trace.h"
#include "console.h"
#include "ui/console.h"
#include "framebuffer.h"
#include "pixel_ops.h"
#include "ui/pixel_ops.h"
#include "qemu-error.h"
#define BITS 8
......
......@@ -22,9 +22,9 @@
* THE SOFTWARE.
*/
#include <stdlib.h>
#include "../qemu-common.h"
#include "../qemu-char.h"
#include "../console.h"
#include "qemu-common.h"
#include "qemu-char.h"
#include "ui/console.h"
#include "msmouse.h"
#define MSMOUSE_LO6(n) ((n) & 0x3f)
......
......@@ -20,10 +20,11 @@
#include "ptimer.h"
#include "block.h"
#include "flash.h"
#include "console.h"
#include "ui/console.h"
#include "i2c.h"
#include "blockdev.h"
#include "exec-memory.h"
#include "ui/pixel_ops.h"
#define MP_MISC_BASE 0x80002000
#define MP_MISC_SIZE 0x00001000
......@@ -492,8 +493,6 @@ SET_LCD_PIXEL(8, uint8_t)
SET_LCD_PIXEL(16, uint16_t)
SET_LCD_PIXEL(32, uint32_t)
#include "pixel_ops.h"
static void lcd_refresh(void *opaque)
{
musicpal_lcd_state *s = opaque;
......
......@@ -23,7 +23,7 @@
#include "omap.h"
#include "arm-misc.h"
#include "irq.h"
#include "console.h"
#include "ui/console.h"
#include "boards.h"
#include "i2c.h"
#include "devices.h"
......
......@@ -18,7 +18,7 @@
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include "hw.h"
#include "console.h"
#include "ui/console.h"
#include "omap.h"
struct omap_dss_s {
......
......@@ -17,9 +17,10 @@
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include "hw.h"
#include "console.h"
#include "ui/console.h"
#include "omap.h"
#include "framebuffer.h"
#include "ui/pixel_ops.h"
struct omap_lcd_panel_s {
MemoryRegion *sysmem;
......@@ -66,8 +67,6 @@ static void omap_lcd_interrupts(struct omap_lcd_panel_s *s)
qemu_irq_lower(s->irq);
}
#include "pixel_ops.h"
#define draw_line_func drawfn
#define DEPTH 8
......
......@@ -26,7 +26,7 @@
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include "hw.h"
#include "console.h"
#include "ui/console.h"
#include "omap.h"
#include "boards.h"
#include "arm-misc.h"
......
......@@ -19,7 +19,7 @@
#include "hw.h"
#include "audio/audio.h"
#include "sysemu.h"
#include "console.h"
#include "ui/console.h"
#include "omap.h"
#include "boards.h"
#include "arm-misc.h"
......
......@@ -8,8 +8,9 @@
*/
#include "sysbus.h"
#include "console.h"
#include "ui/console.h"
#include "framebuffer.h"
#include "ui/pixel_ops.h"
#define PL110_CR_EN 0x001
#define PL110_CR_BGR 0x100
......@@ -109,8 +110,6 @@ static const unsigned char *idregs[] = {
pl111_id
};
#include "pixel_ops.h"
#define BITS 8
#include "pl110_template.h"
#define BITS 15
......
......@@ -23,7 +23,7 @@
*/
#include "hw.h"
#include "ps2.h"
#include "console.h"
#include "ui/console.h"
#include "sysemu.h"
/* debug PC keyboard */
......
......@@ -10,7 +10,7 @@
*/
#include "qemu-common.h"
#include "console.h"
#include "ui/console.h"
#include "elf.h"
#include "exec-memory.h"
#include "sysbus.h"
......
......@@ -13,7 +13,7 @@
#include "hw.h"
#include "pxa.h"
#include "console.h"
#include "ui/console.h"
/*
* Keypad
......
......@@ -11,9 +11,9 @@
*/
#include "hw.h"
#include "console.h"
#include "ui/console.h"
#include "pxa.h"
#include "pixel_ops.h"
#include "ui/pixel_ops.h"
/* FIXME: For graphic_rotate. Should probably be done in common code. */
#include "sysemu.h"
#include "framebuffer.h"
......
#include "qemu-common.h"
#include "console.h"
#include "ui/console.h"
#include "hw.h"
#include "pci/pci.h"
#include "vga_int.h"
......
......@@ -25,11 +25,12 @@
#include <stdio.h>
#include "hw.h"
#include "serial.h"
#include "console.h"
#include "ui/console.h"
#include "devices.h"
#include "sysbus.h"
#include "qdev-addr.h"
#include "range.h"
#include "ui/pixel_ops.h"
/*
* Status: 2010/05/07
......@@ -1163,8 +1164,6 @@ static const MemoryRegionOps sm501_2d_engine_ops = {
/* draw line functions for all console modes */
#include "pixel_ops.h"
typedef void draw_line_func(uint8_t *d, const uint8_t *s,
int width, const uint32_t *pal);
......
......@@ -21,7 +21,7 @@
#include "qemu-timer.h"
#include "devices.h"
#include "sharpsl.h"
#include "console.h"
#include "ui/console.h"
#include "block.h"
#include "audio/audio.h"
#include "boards.h"
......
......@@ -11,7 +11,7 @@
implement one. Most of the commends relating to brightness and geometry
setup are ignored. */
#include "i2c.h"
#include "console.h"
#include "ui/console.h"
//#define DEBUG_SSD0303 1
......
......@@ -11,7 +11,7 @@
implement one. Most of the commends relating to brightness and geometry
setup are ignored. */
#include "ssi.h"
#include "console.h"
#include "ui/console.h"
//#define DEBUG_SSD0323 1
......
......@@ -8,7 +8,7 @@
*/
#include "hw.h"
#include "devices.h"
#include "console.h"
#include "ui/console.h"
typedef struct {
qemu_irq irq;
......
......@@ -13,8 +13,8 @@
#include "hw.h"
#include "devices.h"
#include "flash.h"
#include "console.h"
#include "pixel_ops.h"
#include "ui/console.h"
#include "ui/pixel_ops.h"
#include "blockdev.h"
#define IRQ_TC6393_NAND 0
......
......@@ -23,8 +23,8 @@
*/
#include "qemu-common.h"
#include "console.h"
#include "pixel_ops.h"
#include "ui/console.h"
#include "ui/pixel_ops.h"
#include "sysbus.h"
#include "qdev-addr.h"
......
......@@ -20,7 +20,7 @@
#include "hw.h"
#include "qemu-timer.h"
#include "console.h"
#include "ui/console.h"
#include "devices.h"
#define TSC_CUT_RESOLUTION(value, p) ((value) >> (16 - (p ? 12 : 10)))
......
......@@ -22,7 +22,7 @@
#include "hw.h"
#include "audio/audio.h"
#include "qemu-timer.h"
#include "console.h"
#include "ui/console.h"
#include "omap.h" /* For I2SCodec and uWireSlave */
#include "devices.h"
......
......@@ -23,7 +23,7 @@
#include "qemu-timer.h"
#include "i2c.h"
#include "sysemu.h"
#include "console.h"
#include "ui/console.h"
#define VERBOSE 1
......
......@@ -23,7 +23,7 @@
* THE SOFTWARE.
*/
#include "hw/hw.h"
#include "console.h"
#include "ui/console.h"
#include "hw/usb.h"
#include "hw/usb/desc.h"
#include "qemu-timer.h"
......
......@@ -13,7 +13,7 @@
#include "hw/usb.h"
#include "hw/usb/desc.h"
#include "hw/scsi.h"
#include "console.h"
#include "ui/console.h"
#include "monitor.h"
#include "sysemu.h"
#include "blockdev.h"
......
......@@ -26,7 +26,7 @@
* THE SOFTWARE.
*/
#include "hw/hw.h"
#include "console.h"
#include "ui/console.h"
#include "hw/usb.h"
#include "hw/usb/desc.h"
......
......@@ -31,7 +31,7 @@
*/
#include "qemu-common.h"
#include "console.h"
#include "ui/console.h"
#include "hw/usb.h"
#include "monitor.h"
......
......@@ -22,10 +22,10 @@
* THE SOFTWARE.
*/
#include "hw.h"
#include "console.h"
#include "ui/console.h"
#include "pc.h"
#include "vga_int.h"
#include "pixel_ops.h"
#include "ui/pixel_ops.h"
#include "qemu-timer.h"
#define VGA_RAM_SIZE (8192 * 1024)
......
......@@ -24,10 +24,10 @@
* THE SOFTWARE.
*/
#include "hw.h"
#include "console.h"
#include "ui/console.h"
#include "pc.h"
#include "vga_int.h"
#include "pixel_ops.h"
#include "ui/pixel_ops.h"
#include "qemu-timer.h"
#include "loader.h"
......
......@@ -24,10 +24,10 @@
* THE SOFTWARE.
*/
#include "hw.h"
#include "console.h"
#include "ui/console.h"
#include "pci/pci.h"
#include "vga_int.h"
#include "pixel_ops.h"
#include "ui/pixel_ops.h"
#include "qemu-timer.h"
#include "loader.h"
......
......@@ -23,11 +23,11 @@
*/
#include "hw.h"
#include "vga.h"
#include "console.h"
#include "ui/console.h"
#include "pc.h"
#include "pci/pci.h"
#include "vga_int.h"
#include "pixel_ops.h"
#include "ui/pixel_ops.h"
#include "qemu-timer.h"
#include "xen.h"
#include "trace.h"
......
......@@ -22,7 +22,7 @@
* THE SOFTWARE.
*/
#include "hw.h"
#include "console.h"
#include "ui/console.h"
#include "ps2.h"
#include "pc.h"
#include "qdev.h"
......
......@@ -23,7 +23,7 @@
*/
#include "hw.h"
#include "loader.h"
#include "console.h"
#include "ui/console.h"
#include "pci/pci.h"
#undef VERBOSE
......
......@@ -36,7 +36,7 @@
#include <time.h>
#include "hw.h"
#include "console.h"
#include "ui/console.h"
#include "qemu-char.h"
#include "xen_backend.h"
......
......@@ -21,7 +21,7 @@
#include "sysemu.h"
#include "flash.h"
#include "blockdev.h"
#include "console.h"
#include "ui/console.h"
#include "audio/audio.h"
#include "exec-memory.h"
......
#ifndef CONSOLE_H
#define CONSOLE_H
#include "qemu-pixman.h"
#include "ui/qemu-pixman.h"
#include "qdict.h"
#include "notify.h"
#include "monitor.h"
......
......@@ -20,7 +20,7 @@
#include <spice/qxl_dev.h>
#include "qemu-thread.h"
#include "qemu-pixman.h"
#include "ui/qemu-pixman.h"
#include "sysemu.h"
#define NUM_MEMSLOTS 8
......
......@@ -38,7 +38,7 @@
#include "sysemu.h"
#include "monitor.h"
#include "readline.h"
#include "console.h"
#include "ui/console.h"
#include "blockdev.h"
#include "audio/audio.h"
#include "disas/disas.h"
......
......@@ -23,7 +23,7 @@
*/
#include "qemu-common.h"
#include "monitor.h"
#include "console.h"
#include "ui/console.h"
#include "sysemu.h"
#include "qemu-timer.h"
#include "qemu-char.h"
......
......@@ -24,7 +24,7 @@
#include "sysemu.h"
#include "monitor.h"
#include "console.h"
#include "ui/console.h"
#include "hw/hw.h"
......
......@@ -13,7 +13,7 @@
#include "gdbstub.h"
#include "helper.h"
#include "host-utils.h"
#include "console.h"
#include "ui/console.h"
#undef DEBUG_UC32
......
......@@ -6,7 +6,7 @@ vnc-obj-$(CONFIG_VNC_TLS) += vnc-tls.o vnc-auth-vencrypt.o
vnc-obj-$(CONFIG_VNC_SASL) += vnc-auth-sasl.o
vnc-obj-y += vnc-jobs.o
common-obj-y += keymaps.o
common-obj-y += keymaps.o console.o cursor.o input.o qemu-pixman.o
common-obj-$(CONFIG_SPICE) += spice-core.o spice-input.o spice-display.o
common-obj-$(CONFIG_SDL) += sdl.o sdl_zoom.o x_keymap.o
common-obj-$(CONFIG_COCOA) += cocoa.o
......
......@@ -26,7 +26,7 @@
#include <crt_externs.h>
#include "qemu-common.h"
#include "console.h"
#include "ui/console.h"
#include "sysemu.h"
#ifndef MAC_OS_X_VERSION_10_4
......
......@@ -22,7 +22,7 @@
* THE SOFTWARE.
*/
#include "qemu-common.h"
#include "console.h"
#include "ui/console.h"
#include "qemu-timer.h"
#include "qmp-commands.h"
#include "qemu-char.h"
......
......@@ -29,7 +29,7 @@
#endif
#include "qemu-common.h"
#include "console.h"<