Subversion Repositories HelenOS-historic

Compare Revisions

Ignore whitespace Rev 1755 → Rev 1756

/kernel/trunk/arch/ppc32/include/drivers/pic.h
26,7 → 26,7
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
 
/** @addtogroup ppc32
/** @addtogroup ppc32
* @{
*/
/** @file
35,9 → 35,6
#ifndef __PIC_H_
#define __PIC_H_
 
/* PIC handler, read from pearpc source codes */
#define PIC_HW_ADDR 0x80800000
 
#define PIC_PENDING_LOW 8
#define PIC_PENDING_HIGH 4
#define PIC_MASK_LOW 9
45,7 → 42,7
#define PIC_ACK_LOW 10
#define PIC_ACK_HIGH 6
 
void pic_init(void);
void pic_init(__address base, size_t size);
void pic_enable_interrupt(int intnum);
void pic_disable_interrupt(int intnum);
void pic_ack_interrupt(int intnum);
53,6 → 50,5
 
#endif
 
/** @}
/** @}
*/
 
/kernel/trunk/arch/ppc32/src/ppc32.c
73,9 → 73,9
fb_init(bootinfo.screen.addr, bootinfo.screen.width, bootinfo.screen.height, bootinfo.screen.bpp, bootinfo.screen.scanline);
/* Initialize PIC */
pic_init();
pic_init(bootinfo.keyboard.addr, PAGE_SIZE);
cuda_init(bootinfo.keyboard.addr, bootinfo.keyboard.size);
cuda_init(bootinfo.keyboard.addr + 0x16000, 2 * PAGE_SIZE);
/* Merge all zones to 1 big zone */
zone_merge_all();
/kernel/trunk/arch/ppc32/src/drivers/pic.c
40,9 → 40,9
 
static volatile __u32 *pic;
 
void pic_init(void)
void pic_init(__address base, size_t size)
{
pic = (__u32 *)hw_map(PIC_HW_ADDR, PAGE_SIZE);
pic = (__u32 *) hw_map(base, size);
}