Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset db6e419 in mainline for boot/arch/ia64/src/pal.c


Ignore:
Timestamp:
2011-08-16T18:53:00Z (10 years ago)
Author:
Petr Koupy <petr.koupy@…>
Branches:
lfn, master
Children:
49160c4
Parents:
e0e922d (diff), 45058baa (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.
Message:

Merge mainline changes.

File:
1 moved

Legend:

Unmodified
Added
Removed
  • boot/arch/ia64/src/pal.c

    re0e922d rdb6e419  
    11/*
    2  * Copyright (c) 2006 Ondrej Palkovsky
     2 * Copyright (c) 2011 Jakub Jermar
    33 * All rights reserved.
    44 *
     
    2727 */
    2828
    29 #ifndef FB_PPM_H_
    30 #define FB_PPM_H_
     29#include <arch/pal.h>
     30#include <arch/types.h>
    3131
    32 #include "fb.h"
    33 #include <sys/types.h>
     32uint64_t pal_proc = 0;
    3433
    35 extern int ppm_draw(unsigned char *, size_t, unsigned int, unsigned int,
    36     unsigned int, unsigned int, putpixel_cb_t, void *);
    37 extern int ppm_get_data(unsigned char *, size_t, unsigned int *, unsigned int *);
    38 
    39 #endif
     34uint64_t pal_proc_freq_ratio(void)
     35{
     36        uint64_t proc_ratio;
     37       
     38        pal_static_call_0_1(PAL_FREQ_RATIOS, &proc_ratio);
     39       
     40        return proc_ratio;
     41}
Note: See TracChangeset for help on using the changeset viewer.