[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [xen master] xen/emul-i8254: remove forward declarations and re-order functions
commit d6351a10c80fcbbf2b5996d351b7181ba17b3b32 Author: Federico Serafini <federico.serafini@xxxxxxxxxxx> AuthorDate: Mon Sep 25 10:57:21 2023 +0200 Commit: Jan Beulich <jbeulich@xxxxxxxx> CommitDate: Mon Sep 25 10:57:21 2023 +0200 xen/emul-i8254: remove forward declarations and re-order functions Remove forward declarations, including one that violates MISRA C Rule 8.3 ("All declarations of an object or function shall use the same names and type qualifiers"), and re-order functions. No functional change. Signed-off-by: Federico Serafini <federico.serafini@xxxxxxxxxxx> Acked-by: Jan Beulich <jbeulich@xxxxxxxx> Release-acked-by: Henry Wang <Henry.Wang@xxxxxxx> --- xen/arch/x86/emul-i8254.c | 129 ++++++++++++++++++++++------------------------ 1 file changed, 62 insertions(+), 67 deletions(-) diff --git a/xen/arch/x86/emul-i8254.c b/xen/arch/x86/emul-i8254.c index 41ec4a1ef1..ea17fb502a 100644 --- a/xen/arch/x86/emul-i8254.c +++ b/xen/arch/x86/emul-i8254.c @@ -48,11 +48,6 @@ #define RW_STATE_WORD0 3 #define RW_STATE_WORD1 4 -static int cf_check handle_pit_io( - int dir, unsigned int port, unsigned int bytes, uint32_t *val); -static int cf_check handle_speaker_io( - int dir, unsigned int port, unsigned int bytes, uint32_t *val); - #define get_guest_time(v) \ (is_hvm_vcpu(v) ? hvm_get_guest_time(v) : (u64)get_s_time()) @@ -466,68 +461,7 @@ static int cf_check pit_load(struct domain *d, hvm_domain_context_t *h) HVM_REGISTER_SAVE_RESTORE(PIT, pit_save, pit_load, 1, HVMSR_PER_DOM); #endif -void pit_reset(struct domain *d) -{ - PITState *pit = domain_vpit(d); - struct hvm_hw_pit_channel *s; - int i; - - if ( !has_vpit(d) ) - return; - - if ( is_hvm_domain(d) ) - { - TRACE_0D(TRC_HVM_EMUL_PIT_STOP_TIMER); - destroy_periodic_time(&pit->pt0); - pit->pt0.source = PTSRC_isa; - } - - spin_lock(&pit->lock); - - for ( i = 0; i < 3; i++ ) - { - s = &pit->hw.channels[i]; - s->mode = 0xff; /* the init mode */ - s->gate = (i != 2); - pit_load_count(pit, i, 0); - } - - spin_unlock(&pit->lock); -} - -void pit_init(struct domain *d) -{ - PITState *pit = domain_vpit(d); - - if ( !has_vpit(d) ) - return; - - spin_lock_init(&pit->lock); - - if ( is_hvm_domain(d) ) - { - register_portio_handler(d, PIT_BASE, 4, handle_pit_io); - register_portio_handler(d, 0x61, 1, handle_speaker_io); - } - - pit_reset(d); -} - -void pit_deinit(struct domain *d) -{ - PITState *pit = domain_vpit(d); - - if ( !has_vpit(d) ) - return; - - if ( is_hvm_domain(d) ) - { - TRACE_0D(TRC_HVM_EMUL_PIT_STOP_TIMER); - destroy_periodic_time(&pit->pt0); - } -} - -/* the intercept action for PIT DM retval:0--not handled; 1--handled */ +/* The intercept action for PIT DM retval: 0--not handled; 1--handled. */ static int cf_check handle_pit_io( int dir, unsigned int port, unsigned int bytes, uint32_t *val) { @@ -620,6 +554,67 @@ int pv_pit_handler(int port, int data, int write) return !write ? ioreq.data : 0; } +void pit_reset(struct domain *d) +{ + PITState *pit = domain_vpit(d); + struct hvm_hw_pit_channel *s; + int i; + + if ( !has_vpit(d) ) + return; + + if ( is_hvm_domain(d) ) + { + TRACE_0D(TRC_HVM_EMUL_PIT_STOP_TIMER); + destroy_periodic_time(&pit->pt0); + pit->pt0.source = PTSRC_isa; + } + + spin_lock(&pit->lock); + + for ( i = 0; i < 3; i++ ) + { + s = &pit->hw.channels[i]; + s->mode = 0xff; /* the init mode */ + s->gate = (i != 2); + pit_load_count(pit, i, 0); + } + + spin_unlock(&pit->lock); +} + +void pit_init(struct domain *d) +{ + PITState *pit = domain_vpit(d); + + if ( !has_vpit(d) ) + return; + + spin_lock_init(&pit->lock); + + if ( is_hvm_domain(d) ) + { + register_portio_handler(d, PIT_BASE, 4, handle_pit_io); + register_portio_handler(d, 0x61, 1, handle_speaker_io); + } + + pit_reset(d); +} + +void pit_deinit(struct domain *d) +{ + PITState *pit = domain_vpit(d); + + if ( !has_vpit(d) ) + return; + + if ( is_hvm_domain(d) ) + { + TRACE_0D(TRC_HVM_EMUL_PIT_STOP_TIMER); + destroy_periodic_time(&pit->pt0); + } +} + /* * Local variables: * mode: C -- generated by git-patchbot for /home/xen/git/xen.git#master
|
![]() |
Lists.xenproject.org is hosted with RackSpace, monitoring our |