Changeset 0a208110 in mainline for uspace/lib
- Timestamp:
- 2012-02-24T18:04:56Z (14 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 2578199
- Parents:
- b9bbaad (diff), 087768f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the(diff)links above to see all the changes relative to each parent. - Location:
- uspace/lib
- Files:
-
- 2 edited
-
c/arch/ia64/include/ddi.h (modified) (7 diffs)
-
drv/generic/interrupt.c (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
uspace/lib/c/arch/ia64/include/ddi.h
rb9bbaad r0a208110 62 62 63 63 asm volatile ("mf\n" ::: "memory"); 64 asm volatile ("mf.a\n" ::: "memory"); 64 65 } 65 66 … … 76 77 77 78 asm volatile ("mf\n" ::: "memory"); 79 asm volatile ("mf.a\n" ::: "memory"); 78 80 } 79 81 … … 90 92 91 93 asm volatile ("mf\n" ::: "memory"); 94 asm volatile ("mf.a\n" ::: "memory"); 92 95 } 93 96 … … 106 109 v = *port; 107 110 } 111 112 asm volatile ("mf.a\n" ::: "memory"); 108 113 109 114 return v; … … 125 130 } 126 131 132 asm volatile ("mf.a\n" ::: "memory"); 133 127 134 return v; 128 135 } … … 134 141 asm volatile ("mf\n" ::: "memory"); 135 142 136 if (port < (ioport32_t *) port) {143 if (port < (ioport32_t *) IO_SPACE_BOUNDARY) { 137 144 uintptr_t prt = (uintptr_t) port; 138 145 … … 143 150 } 144 151 152 asm volatile ("mf.a\n" ::: "memory"); 153 145 154 return v; 146 155 } -
uspace/lib/drv/generic/interrupt.c
rb9bbaad r0a208110 68 68 69 69 static irq_code_t default_pseudocode = { 70 0, 71 NULL, 70 72 sizeof(default_cmds) / sizeof(irq_cmd_t), 71 73 default_cmds
Note:
See TracChangeset
for help on using the changeset viewer.
