AVR is the architecture, Atmel the manufacturer.
Suggested-by: Aleksandar Markovic <aleksandar.m.m...@gmail.com>
Signed-off-by: Philippe Mathieu-Daudé <f4...@amsat.org>
---
!squash
---
include/hw/char/{avr_usart.h => atmel_usart.h} | 10 +++++-----
hw/avr/sample.c | 2 +-
hw/char/{avr_usart.c => atmel_usart.c} | 4 ++--
MAINTAINERS | 4 ++--
hw/avr/Kconfig | 2 +-
hw/char/Kconfig | 2 +-
hw/char/Makefile.objs | 2 +-
7 files changed, 13 insertions(+), 13 deletions(-)
rename include/hw/char/{avr_usart.h => atmel_usart.h} (93%)
rename hw/char/{avr_usart.c => atmel_usart.c} (99%)
diff --git a/include/hw/char/avr_usart.h b/include/hw/char/atmel_usart.h
similarity index 93%
rename from include/hw/char/avr_usart.h
rename to include/hw/char/atmel_usart.h
index 467e97e8c0..fd35feac60 100644
--- a/include/hw/char/avr_usart.h
+++ b/include/hw/char/atmel_usart.h
@@ -1,5 +1,5 @@
/*
- * AVR USART
+ * Atmel AVR USART
*
* Copyright (c) 2018 University of Kent
* Author: Sarah Harris
@@ -19,8 +19,8 @@
* <http://www.gnu.org/licenses/lgpl-2.1.html>
*/
-#ifndef HW_AVR_USART_H
-#define HW_AVR_USART_H
+#ifndef HW_CHAR_ATMEL_USART_H
+#define HW_CHAR_ATMEL_USART_H
#include "hw/sysbus.h"
#include "chardev/char-fe.h"
@@ -56,7 +56,7 @@
#define USART_CSRC_CSZ1 (1 << 2)
#define USART_CSRC_CSZ0 (1 << 1)
-#define TYPE_AVR_USART "avr-usart"
+#define TYPE_AVR_USART "atmel-usart"
#define AVR_USART(obj) \
OBJECT_CHECK(AVRUsartState, (obj), TYPE_AVR_USART)
@@ -90,4 +90,4 @@ typedef struct {
qemu_irq dre_irq;
} AVRUsartState;
-#endif /* HW_AVR_USART_H */
+#endif /* HW_CHAR_ATMEL_USART_H */
diff --git a/hw/avr/sample.c b/hw/avr/sample.c
index 95094a8d6c..ca67c11233 100644
--- a/hw/avr/sample.c
+++ b/hw/avr/sample.c
@@ -44,7 +44,7 @@
#include "qemu/error-report.h"
#include "exec/address-spaces.h"
#include "include/hw/sysbus.h"
-#include "include/hw/char/avr_usart.h"
+#include "include/hw/char/atmel_usart.h"
#include "include/hw/timer/avr_timer16.h"
#include "include/hw/misc/avr_mask.h"
#include "elf.h"
diff --git a/hw/char/avr_usart.c b/hw/char/atmel_usart.c
similarity index 99%
rename from hw/char/avr_usart.c
rename to hw/char/atmel_usart.c
index becdb87847..a7004c212a 100644
--- a/hw/char/avr_usart.c
+++ b/hw/char/atmel_usart.c
@@ -1,5 +1,5 @@
/*
- * AVR USART
+ * Atmel AVR USART
*
* Copyright (c) 2018 University of Kent
* Author: Sarah Harris
@@ -20,7 +20,7 @@
*/
#include "qemu/osdep.h"
-#include "hw/char/avr_usart.h"
+#include "hw/char/atmel_usart.h"
#include "qemu/log.h"
#include "hw/irq.h"
#include "hw/qdev-properties.h"
diff --git a/MAINTAINERS b/MAINTAINERS
index 4998fee99a..f2e01a6d16 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -896,8 +896,8 @@ M: Michael Rolnik <mrol...@gmail.com>
R: Sarah Harris <s.e.har...@kent.ac.uk>
S: Maintained
F: hw/avr/
-F: hw/char/avr_usart.c
-F: include/hw/char/avr_usart.h
+F: hw/char/atmel_usart.c
+F: include/hw/char/atmel_usart.h
F: hw/timer/avr_timer16.c
F: include/hw/timer/avr_timer16.h
F: hw/misc/avr_mask.c
diff --git a/hw/avr/Kconfig b/hw/avr/Kconfig
index 92aa1e6afb..8084a73176 100644
--- a/hw/avr/Kconfig
+++ b/hw/avr/Kconfig
@@ -1,6 +1,6 @@
config AVR_SAMPLE
bool
select AVR_TIMER16
- select AVR_USART
+ select ATMEL_USART
select AVR_MASK
select UNIMP
diff --git a/hw/char/Kconfig b/hw/char/Kconfig
index 331b20983f..5a27681884 100644
--- a/hw/char/Kconfig
+++ b/hw/char/Kconfig
@@ -47,5 +47,5 @@ config SCLPCONSOLE
config TERMINAL3270
bool
-config AVR_USART
+config ATMEL_USART
bool
diff --git a/hw/char/Makefile.objs b/hw/char/Makefile.objs
index f05c1f5667..c23ad3b4a7 100644
--- a/hw/char/Makefile.objs
+++ b/hw/char/Makefile.objs
@@ -21,7 +21,7 @@ obj-$(CONFIG_PSERIES) += spapr_vty.o
obj-$(CONFIG_DIGIC) += digic-uart.o
obj-$(CONFIG_STM32F2XX_USART) += stm32f2xx_usart.o
obj-$(CONFIG_RASPI) += bcm2835_aux.o
-common-obj-$(CONFIG_AVR_USART) += avr_usart.o
+common-obj-$(CONFIG_ATMEL_USART) += atmel_usart.o
common-obj-$(CONFIG_CMSDK_APB_UART) += cmsdk-apb-uart.o
common-obj-$(CONFIG_ETRAXFS) += etraxfs_ser.o
--
2.21.1
