Changeset 8df5f20 in mainline for kernel/arch/ppc32/include

Timestamp:

2019-02-11T14:56:26Z (7 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

4805495

Parents:

391996b

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-02-01 23:26:21)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-02-11 14:56:26)

Message:

Rename NO_TRACE to _NO_TRACE

<trace.h> may end up transitively included from standard headers,
so it needs to be a reserved identifier.

Location:

kernel/arch/ppc32/include/arch

Files:

• asm.h (modified) (12 diffs)
• cpu.h (modified) (1 diff)
• cycle.h (modified) (1 diff)
• istate.h (modified) (2 diffs)
• mm/frame.h (modified) (1 diff)
• mm/page.h (modified) (3 diffs)

kernel/arch/ppc32/include/arch/asm.h

@@ -42 +42 @@
 #include <trace.h>
 
-NO_TRACE static inline uint32_t msr_read(void)
+_NO_TRACE static inline uint32_t msr_read(void)
 {
         uint32_t msr;
@@ -54 +54 @@
 }
 
-NO_TRACE static inline void msr_write(uint32_t msr)
+_NO_TRACE static inline void msr_write(uint32_t msr)
 {
         asm volatile (
@@ -63 +63 @@
 }
 
-NO_TRACE static inline void sr_set(uint32_t flags, asid_t asid, uint32_t sr)
+_NO_TRACE static inline void sr_set(uint32_t flags, asid_t asid, uint32_t sr)
 {
         asm volatile (
@@ -74 +74 @@
 }
 
-NO_TRACE static inline uint32_t sr_get(uint32_t vaddr)
+_NO_TRACE static inline uint32_t sr_get(uint32_t vaddr)
 {
         uint32_t vsid;
@@ -87 +87 @@
 }
 
-NO_TRACE static inline uint32_t sdr1_get(void)
+_NO_TRACE static inline uint32_t sdr1_get(void)
 {
         uint32_t sdr1;
@@ -107 +107 @@
  *
  */
-NO_TRACE static inline ipl_t interrupts_enable(void)
+_NO_TRACE static inline ipl_t interrupts_enable(void)
 {
         ipl_t ipl = msr_read();
@@ -122 +122 @@
  *
  */
-NO_TRACE static inline ipl_t interrupts_disable(void)
+_NO_TRACE static inline ipl_t interrupts_disable(void)
 {
         ipl_t ipl = msr_read();
@@ -136 +136 @@
  *
  */
-NO_TRACE static inline void interrupts_restore(ipl_t ipl)
+_NO_TRACE static inline void interrupts_restore(ipl_t ipl)
 {
         msr_write((msr_read() & (~MSR_EE)) | (ipl & MSR_EE));
@@ -148 +148 @@
  *
  */
-NO_TRACE static inline ipl_t interrupts_read(void)
+_NO_TRACE static inline ipl_t interrupts_read(void)
 {
         return msr_read();
@@ -158 +158 @@
  *
  */
-NO_TRACE static inline bool interrupts_disabled(void)
+_NO_TRACE static inline bool interrupts_disabled(void)
 {
         return ((msr_read() & MSR_EE) == 0);
@@ -170 +170 @@
  *
  */
-NO_TRACE static inline uintptr_t get_stack_base(void)
+_NO_TRACE static inline uintptr_t get_stack_base(void)
 {
         uintptr_t base;
@@ -183 +183 @@
 }
 
-NO_TRACE static inline void cpu_sleep(void)
-{
-}
-
-NO_TRACE static inline void pio_write_8(ioport8_t *port, uint8_t v)
+_NO_TRACE static inline void cpu_sleep(void)
+{
+}
+
+_NO_TRACE static inline void pio_write_8(ioport8_t *port, uint8_t v)
 {
         *port = v;
 }
 
-NO_TRACE static inline void pio_write_16(ioport16_t *port, uint16_t v)
+_NO_TRACE static inline void pio_write_16(ioport16_t *port, uint16_t v)
 {
         *port = v;
 }
 
-NO_TRACE static inline void pio_write_32(ioport32_t *port, uint32_t v)
+_NO_TRACE static inline void pio_write_32(ioport32_t *port, uint32_t v)
 {
         *port = v;
 }
 
-NO_TRACE static inline uint8_t pio_read_8(ioport8_t *port)
+_NO_TRACE static inline uint8_t pio_read_8(ioport8_t *port)
 {
         return *port;
 }
 
-NO_TRACE static inline uint16_t pio_read_16(ioport16_t *port)
+_NO_TRACE static inline uint16_t pio_read_16(ioport16_t *port)
 {
         return *port;
 }
 
-NO_TRACE static inline uint32_t pio_read_32(ioport32_t *port)
+_NO_TRACE static inline uint32_t pio_read_32(ioport32_t *port)
 {
         return *port;

kernel/arch/ppc32/include/arch/cpu.h

@@ -44 +44 @@
 } __attribute__((packed)) cpu_arch_t;
 
-NO_TRACE static inline void cpu_version(cpu_arch_t *info)
+_NO_TRACE static inline void cpu_version(cpu_arch_t *info)
 {
         asm volatile (

kernel/arch/ppc32/include/arch/cycle.h

@@ -38 +38 @@
 #include <trace.h>
 
-NO_TRACE static inline uint64_t get_cycle(void)
+_NO_TRACE static inline uint64_t get_cycle(void)
 {
         uint32_t lower;

kernel/arch/ppc32/include/arch/istate.h

@@ -50 +50 @@
 #endif /* KERNEL */
 
-NO_TRACE static inline void istate_set_retaddr(istate_t *istate,
+_NO_TRACE static inline void istate_set_retaddr(istate_t *istate,
     uintptr_t retaddr)
 {
@@ -61 +61 @@
  *
  */
-NO_TRACE static inline int istate_from_uspace(istate_t *istate)
+_NO_TRACE static inline int istate_from_uspace(istate_t *istate)
 {
         return (istate->srr1 & MSR_PR) != 0;
 }
 
-NO_TRACE static inline sysarg_t istate_get_pc(istate_t *istate)
+_NO_TRACE static inline sysarg_t istate_get_pc(istate_t *istate)
 {
         return istate->pc;
 }
 
-NO_TRACE static inline sysarg_t istate_get_fp(istate_t *istate)
+_NO_TRACE static inline sysarg_t istate_get_fp(istate_t *istate)
 {
         return istate->sp;

kernel/arch/ppc32/include/arch/mm/frame.h

@@ -46 +46 @@
 #include <trace.h>
 
-NO_TRACE static inline uint32_t physmem_top(void)
+_NO_TRACE static inline uint32_t physmem_top(void)
 {
         uint32_t physmem;

kernel/arch/ppc32/include/arch/mm/page.h

@@ -162 +162 @@
 } pte_t;
 
-NO_TRACE static inline unsigned int get_pt_flags(pte_t *pt, size_t i)
+_NO_TRACE static inline unsigned int get_pt_flags(pte_t *pt, size_t i)
 {
         pte_t *entry = &pt[i];
@@ -175 +175 @@
 }
 
-NO_TRACE static inline void set_pt_flags(pte_t *pt, size_t i, int flags)
+_NO_TRACE static inline void set_pt_flags(pte_t *pt, size_t i, int flags)
 {
         pte_t *entry = &pt[i];
@@ -185 +185 @@
 }
 
-NO_TRACE static inline void set_pt_present(pte_t *pt, size_t i)
+_NO_TRACE static inline void set_pt_present(pte_t *pt, size_t i)
 {
         pte_t *entry = &pt[i];