similarity index 89%
rename from include/hw/misc/avr_mask.h
rename to include/hw/misc/atmel_power.h
@@ -1,5 +1,5 @@
/*
- * AVR Power Reduction
+ * Atmel AVR Power Reduction Management
*
* Copyright (c) 2019 Michael Rolnik
*
@@ -22,14 +22,14 @@
* THE SOFTWARE.
*/
-#ifndef HW_avr_mask_H
-#define HW_avr_mask_H
+#ifndef HW_MISC_ATMEL_POWER_H
+#define HW_MISC_ATMEL_POWER_H
#include "hw/sysbus.h"
#include "hw/hw.h"
-#define TYPE_AVR_MASK "avr-mask"
+#define TYPE_AVR_MASK "atmel-power"
#define AVR_MASK(obj) OBJECT_CHECK(AVRMaskState, (obj), TYPE_AVR_MASK)
typedef struct {
@@ -43,4 +43,4 @@ typedef struct {
qemu_irq irq[8];
} AVRMaskState;
-#endif /* HW_avr_mask_H */
+#endif /* HW_MISC_ATMEL_POWER_H */
@@ -46,7 +46,7 @@
#include "include/hw/sysbus.h"
#include "include/hw/char/atmel_usart.h"
#include "include/hw/timer/atmel_timer16.h"
-#include "include/hw/misc/avr_mask.h"
+#include "include/hw/misc/atmel_power.h"
#include "elf.h"
#include "hw/misc/unimp.h"
similarity index 97%
rename from hw/misc/avr_mask.c
rename to hw/misc/atmel_power.c
@@ -1,5 +1,5 @@
/*
- * AVR Power Reduction
+ * Atmel AVR Power Reduction Management
*
* Copyright (c) 2019 Michael Rolnik
*
@@ -23,7 +23,7 @@
*/
#include "qemu/osdep.h"
-#include "hw/misc/avr_mask.h"
+#include "hw/misc/atmel_power.h"
#include "qemu/log.h"
#include "hw/qdev-properties.h"
#include "hw/irq.h"
@@ -900,8 +900,8 @@ F: hw/char/atmel_usart.c
F: include/hw/char/atmel_usart.h
F: hw/timer/atmel_timer16.c
F: include/hw/timer/atmel_timer16.h
-F: hw/misc/avr_mask.c
-F: include/hw/misc/avr_mask.h
+F: hw/misc/atmel_power.c
+F: include/hw/misc/atmel_power.h
F: tests/acceptance/machine_avr6.py
CRIS Machines
@@ -2,5 +2,5 @@ config AVR_SAMPLE
bool
select ATMEL_TIMER16
select ATMEL_USART
- select AVR_MASK
+ select ATMEL_POWER
select UNIMP
@@ -131,7 +131,7 @@ config MAC_VIA
select MOS6522
select ADB
-config AVR_MASK
+config ATMEL_POWER
bool
source macio/Kconfig
@@ -86,4 +86,4 @@ obj-$(CONFIG_MAC_VIA) += mac_via.o
common-obj-$(CONFIG_GRLIB) += grlib_ahb_apb_pnp.o
-obj-$(CONFIG_AVR_MASK) += avr_mask.o
+obj-$(CONFIG_ATMEL_POWER) += atmel_power.o
AVR is the architecture, Atmel the manufacturer. Suggested-by: Aleksandar Markovic <aleksandar.m.mail@gmail.com> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> --- !squash --- include/hw/misc/{avr_mask.h => atmel_power.h} | 10 +++++----- hw/avr/sample.c | 2 +- hw/misc/{avr_mask.c => atmel_power.c} | 4 ++-- MAINTAINERS | 4 ++-- hw/avr/Kconfig | 2 +- hw/misc/Kconfig | 2 +- hw/misc/Makefile.objs | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) rename include/hw/misc/{avr_mask.h => atmel_power.h} (89%) rename hw/misc/{avr_mask.c => atmel_power.c} (97%)