Changeset 8565a42 in mainline for kernel/arch/ppc32/src/drivers/pic.c
- Timestamp:
- 2018-03-02T20:34:50Z (7 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- a1a81f69, d5e5fd1
- Parents:
- 3061bc1 (diff), 34e1206 (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. - git-author:
- Jiří Zárevúcky <zarevucky.jiri@…> (2018-03-02 20:34:50)
- git-committer:
- GitHub <noreply@…> (2018-03-02 20:34:50)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
kernel/arch/ppc32/src/drivers/pic.c
r3061bc1 r8565a42 55 55 pic[PIC_MASK_HIGH] = pic[PIC_MASK_HIGH] | (1 << (intnum - 32)); 56 56 } 57 57 58 58 } 59 59 … … 85 85 if (pic) { 86 86 uint32_t pending; 87 87 88 88 pending = pic[PIC_PENDING_LOW]; 89 89 if (pending != 0) 90 90 return fnzb32(pending); 91 91 92 92 pending = pic[PIC_PENDING_HIGH]; 93 93 if (pending != 0) 94 94 return fnzb32(pending) + 32; 95 95 } 96 96 97 97 return 255; 98 98 }
Note:
See TracChangeset
for help on using the changeset viewer.