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


Ignore:
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/mips32/include/arch
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • kernel/arch/mips32/include/arch/asm.h

    r391996b r8df5f20  
    4040#include <trace.h>
    4141
    42 NO_TRACE static inline void cpu_sleep(void)
     42_NO_TRACE static inline void cpu_sleep(void)
    4343{
    4444        asm volatile ("wait");
    … …  
    5252 *
    5353 */
    54 NO_TRACE static inline uintptr_t get_stack_base(void)
     54_NO_TRACE static inline uintptr_t get_stack_base(void)
    5555{
    5656        uintptr_t base;
    … …  
    6565}
    6666
    67 NO_TRACE static inline void pio_write_8(ioport8_t *port, uint8_t v)
     67_NO_TRACE static inline void pio_write_8(ioport8_t *port, uint8_t v)
    6868{
    6969        *port = v;
    7070}
    7171
    72 NO_TRACE static inline void pio_write_16(ioport16_t *port, uint16_t v)
     72_NO_TRACE static inline void pio_write_16(ioport16_t *port, uint16_t v)
    7373{
    7474        *port = v;
    7575}
    7676
    77 NO_TRACE static inline void pio_write_32(ioport32_t *port, uint32_t v)
     77_NO_TRACE static inline void pio_write_32(ioport32_t *port, uint32_t v)
    7878{
    7979        *port = v;
    8080}
    8181
    82 NO_TRACE static inline uint8_t pio_read_8(ioport8_t *port)
     82_NO_TRACE static inline uint8_t pio_read_8(ioport8_t *port)
    8383{
    8484        return *port;
    8585}
    8686
    87 NO_TRACE static inline uint16_t pio_read_16(ioport16_t *port)
     87_NO_TRACE static inline uint16_t pio_read_16(ioport16_t *port)
    8888{
    8989        return *port;
    9090}
    9191
    92 NO_TRACE static inline uint32_t pio_read_32(ioport32_t *port)
     92_NO_TRACE static inline uint32_t pio_read_32(ioport32_t *port)
    9393{
    9494        return *port;

  • kernel/arch/mips32/include/arch/cycle.h

    r391996b r8df5f20  
    4040#include <trace.h>
    4141
    42 NO_TRACE static inline uint64_t get_cycle(void)
     42_NO_TRACE static inline uint64_t get_cycle(void)
    4343{
    4444        return ((uint64_t) count_hi << 32) + ((uint64_t) cp0_count_read());

  • kernel/arch/mips32/include/arch/istate.h

    r391996b r8df5f20  
    5050#endif /* KERNEL */
    5151
    52 NO_TRACE static inline void istate_set_retaddr(istate_t *istate,
     52_NO_TRACE static inline void istate_set_retaddr(istate_t *istate,
    5353    uintptr_t retaddr)
    5454{
    … …  
    5757
    5858/** Return true if exception happened while in userspace */
    59 NO_TRACE static inline int istate_from_uspace(istate_t *istate)
     59_NO_TRACE static inline int istate_from_uspace(istate_t *istate)
    6060{
    6161        return istate->status & cp0_status_um_bit;
    6262}
    6363
    64 NO_TRACE static inline uintptr_t istate_get_pc(istate_t *istate)
     64_NO_TRACE static inline uintptr_t istate_get_pc(istate_t *istate)
    6565{
    6666        return istate->epc;
    6767}
    6868
    69 NO_TRACE static inline uintptr_t istate_get_fp(istate_t *istate)
     69_NO_TRACE static inline uintptr_t istate_get_fp(istate_t *istate)
    7070{
    7171        return istate->sp;

  • kernel/arch/mips32/include/arch/mm/page.h

    r391996b r8df5f20  
    161161} pte_t;
    162162
    163 NO_TRACE static inline unsigned int get_pt_flags(pte_t *pt, size_t i)
     163_NO_TRACE static inline unsigned int get_pt_flags(pte_t *pt, size_t i)
    164164{
    165165        pte_t *p = &pt[i];
    … …  
    174174}
    175175
    176 NO_TRACE static inline void set_pt_flags(pte_t *pt, size_t i, int flags)
     176_NO_TRACE static inline void set_pt_flags(pte_t *pt, size_t i, int flags)
    177177{
    178178        pte_t *p = &pt[i];
    … …  
    189189}
    190190
    191 NO_TRACE static inline void set_pt_present(pte_t *pt, size_t i)
     191_NO_TRACE static inline void set_pt_present(pte_t *pt, size_t i)
    192192{
    193193        pte_t *p = &pt[i];

  • kernel/arch/mips32/include/arch/mm/tlb.h

    r391996b r8df5f20  
    135135 * Probe TLB for Matching Entry.
    136136 */
    137 NO_TRACE static inline void tlbp(void)
     137_NO_TRACE static inline void tlbp(void)
    138138{
    139139        asm volatile ("tlbp\n\t");
    … …  
    144144 * Read Indexed TLB Entry.
    145145 */
    146 NO_TRACE static inline void tlbr(void)
     146_NO_TRACE static inline void tlbr(void)
    147147{
    148148        asm volatile ("tlbr\n\t");
    … …  
    153153 * Write Indexed TLB Entry.
    154154 */
    155 NO_TRACE static inline void tlbwi(void)
     155_NO_TRACE static inline void tlbwi(void)
    156156{
    157157        asm volatile ("tlbwi\n\t");
    … …  
    162162 * Write Random TLB Entry.
    163163 */
    164 NO_TRACE static inline void tlbwr(void)
     164_NO_TRACE static inline void tlbwr(void)
    165165{
    166166        asm volatile ("tlbwr\n\t");
Note: See TracChangeset for help on using the changeset viewer.