diff options
author | Jeff Bailey <jbailey@raspberryginger.com> | 2007-09-28 14:22:19 -0400 |
---|---|---|
committer | Kyle McMartin <kyle@shortfin.cabal.ca> | 2007-10-18 03:58:29 -0400 |
commit | c75ac712df81bf0b9a561bd89f74282650440035 (patch) | |
tree | 3d92a2b35cf2bc57333ee66030efc3afb8d5341c /include/asm-parisc | |
parent | 2cfc5be7df26b6fbe9a293e2abf388a6e5b9a39e (diff) |
[PARISC] Export pdc.h for palo
Signed-off-by: Jeff Bailey <jbailey@raspberryginger.com>
Signed-off-by: Kyle McMartin <kyle@mcmartin.ca>
Diffstat (limited to 'include/asm-parisc')
-rw-r--r-- | include/asm-parisc/Kbuild | 2 | ||||
-rw-r--r-- | include/asm-parisc/pdc.h | 19 |
2 files changed, 15 insertions, 6 deletions
diff --git a/include/asm-parisc/Kbuild b/include/asm-parisc/Kbuild index c68e1680da01..f88b252e419c 100644 --- a/include/asm-parisc/Kbuild +++ b/include/asm-parisc/Kbuild | |||
@@ -1 +1,3 @@ | |||
1 | include include/asm-generic/Kbuild.asm | 1 | include include/asm-generic/Kbuild.asm |
2 | |||
3 | unifdef-y += pdc.h | ||
diff --git a/include/asm-parisc/pdc.h b/include/asm-parisc/pdc.h index 876fd8116d4a..775726d8a716 100644 --- a/include/asm-parisc/pdc.h +++ b/include/asm-parisc/pdc.h | |||
@@ -143,14 +143,15 @@ | |||
143 | #define PDC_MEM_RET_PDT_FULL -11 | 143 | #define PDC_MEM_RET_PDT_FULL -11 |
144 | #define PDC_MEM_RET_INVALID_PHYSICAL_LOCATION ~0ULL | 144 | #define PDC_MEM_RET_INVALID_PHYSICAL_LOCATION ~0ULL |
145 | 145 | ||
146 | #ifndef __ASSEMBLY__ | 146 | #ifdef __KERNEL__ |
147 | # ifndef __ASSEMBLY__ | ||
147 | typedef struct { | 148 | typedef struct { |
148 | unsigned long long baseAddr; | 149 | unsigned long long baseAddr; |
149 | unsigned int pages; | 150 | unsigned int pages; |
150 | unsigned int reserved; | 151 | unsigned int reserved; |
151 | } MemAddrTable_t; | 152 | } MemAddrTable_t; |
152 | #endif | 153 | # endif /* __ASSEMBLY__ */ |
153 | 154 | #endif /* __KERNEL__ */ | |
154 | 155 | ||
155 | #define PDC_PSW 21 /* Get/Set default System Mask */ | 156 | #define PDC_PSW 21 /* Get/Set default System Mask */ |
156 | #define PDC_PSW_MASK 0 /* Return mask */ | 157 | #define PDC_PSW_MASK 0 /* Return mask */ |
@@ -296,8 +297,11 @@ typedef struct { | |||
296 | #define OSTAT_ON 7 | 297 | #define OSTAT_ON 7 |
297 | 298 | ||
298 | #ifndef __ASSEMBLY__ | 299 | #ifndef __ASSEMBLY__ |
299 | |||
300 | #include <linux/types.h> | 300 | #include <linux/types.h> |
301 | #endif /* __ASSEMBLY__ */ | ||
302 | |||
303 | #ifdef __KERNEL__ | ||
304 | # ifndef __ASSEMBLY__ | ||
301 | 305 | ||
302 | extern int pdc_type; | 306 | extern int pdc_type; |
303 | 307 | ||
@@ -558,7 +562,8 @@ struct pdc_hpmc_pim_20 { /* PDC_PIM */ | |||
558 | __u64 fr[32]; | 562 | __u64 fr[32]; |
559 | }; | 563 | }; |
560 | 564 | ||
561 | #endif /* __ASSEMBLY__ */ | 565 | # endif /* __ASSEMBLY__ */ |
566 | #endif /* __KERNEL__ */ | ||
562 | 567 | ||
563 | /* flags of the device_path (see below) */ | 568 | /* flags of the device_path (see below) */ |
564 | #define PF_AUTOBOOT 0x80 | 569 | #define PF_AUTOBOOT 0x80 |
@@ -707,6 +712,7 @@ struct zeropage { | |||
707 | #define BOOT_CONSOLE_SPA_OFFSET 0x3c4 | 712 | #define BOOT_CONSOLE_SPA_OFFSET 0x3c4 |
708 | #define BOOT_CONSOLE_PATH_OFFSET 0x3a8 | 713 | #define BOOT_CONSOLE_PATH_OFFSET 0x3a8 |
709 | 714 | ||
715 | #ifdef __KERNEL__ | ||
710 | #ifndef __ASSEMBLY__ | 716 | #ifndef __ASSEMBLY__ |
711 | void pdc_console_init(void); /* in pdc_console.c */ | 717 | void pdc_console_init(void); /* in pdc_console.c */ |
712 | void pdc_console_restart(void); | 718 | void pdc_console_restart(void); |
@@ -786,6 +792,7 @@ static inline char * os_id_to_string(u16 os_id) { | |||
786 | default: return "Unknown"; | 792 | default: return "Unknown"; |
787 | } | 793 | } |
788 | } | 794 | } |
789 | #endif /* __ASSEMBLY__ */ | 795 | # endif /* __ASSEMBLY__ */ |
796 | #endif /* __KERNEL__ */ | ||
790 | 797 | ||
791 | #endif /* _PARISC_PDC_H */ | 798 | #endif /* _PARISC_PDC_H */ |