From 0ee10242fd5c40ef0268147b23ba225b843e2d20 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andreas=20F=C3=A4rber?= Date: Wed, 24 Jul 2013 22:49:02 +0200 Subject: [PATCH] lm32_juart: Relocate and tidy header MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Färber --- MAINTAINERS | 1 + hw/char/lm32_juart.c | 2 +- include/hw/{lm32 => char}/lm32_juart.h | 6 +++--- target-lm32/op_helper.c | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) rename include/hw/{lm32 => char}/lm32_juart.h (72%) diff --git a/MAINTAINERS b/MAINTAINERS index 93ad19d..82ca5fb 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -80,6 +80,7 @@ M: Michael Walle S: Maintained F: target-lm32/ F: hw/lm32/ +F: hw/char/lm32_* M68K M: Paul Brook diff --git a/hw/char/lm32_juart.c b/hw/char/lm32_juart.c index 839f3eb..154511e 100644 --- a/hw/char/lm32_juart.c +++ b/hw/char/lm32_juart.c @@ -22,7 +22,7 @@ #include "trace.h" #include "sysemu/char.h" -#include "hw/lm32/lm32_juart.h" +#include "hw/char/lm32_juart.h" enum { LM32_JUART_MIN_SAVE_VERSION = 0, diff --git a/include/hw/lm32/lm32_juart.h b/include/hw/char/lm32_juart.h similarity index 72% rename from include/hw/lm32/lm32_juart.h rename to include/hw/char/lm32_juart.h index 67fc586..1cd3148 100644 --- a/include/hw/lm32/lm32_juart.h +++ b/include/hw/char/lm32_juart.h @@ -1,7 +1,7 @@ -#ifndef QEMU_HW_LM32_JUART_H -#define QEMU_HW_LM32_JUART_H +#ifndef QEMU_HW_CHAR_LM32_JUART_H +#define QEMU_HW_CHAR_LM32_JUART_H -#include "qemu-common.h" +#include "hw/qdev.h" uint32_t lm32_juart_get_jtx(DeviceState *d); uint32_t lm32_juart_get_jrx(DeviceState *d); diff --git a/target-lm32/op_helper.c b/target-lm32/op_helper.c index f106873..2dab9f2 100644 --- a/target-lm32/op_helper.c +++ b/target-lm32/op_helper.c @@ -4,7 +4,7 @@ #include "qemu/host-utils.h" #include "hw/lm32/lm32_pic.h" -#include "hw/lm32/lm32_juart.h" +#include "hw/char/lm32_juart.h" #if !defined(CONFIG_USER_ONLY) #define MMUSUFFIX _mmu -- 2.7.4