diff options
| author | simokawa <simokawa@FreeBSD.org> | 2004-10-22 15:39:39 +0000 |
|---|---|---|
| committer | simokawa <simokawa@FreeBSD.org> | 2004-10-22 15:39:39 +0000 |
| commit | d731e713caed683adb7ebcbc50b984489710fd2b (patch) | |
| tree | 5eb5aff796305287756b0241201be090ed0d9061 /sys/dev/firewire | |
| parent | 251f5975d3e77cd69a08241b362708ff6020b89a (diff) | |
| download | FreeBSD-src-d731e713caed683adb7ebcbc50b984489710fd2b.zip FreeBSD-src-d731e713caed683adb7ebcbc50b984489710fd2b.tar.gz | |
Respect _BOOT flag.
Diffstat (limited to 'sys/dev/firewire')
| -rw-r--r-- | sys/dev/firewire/fwcrom.c | 14 | ||||
| -rw-r--r-- | sys/dev/firewire/iec13213.h | 4 |
2 files changed, 12 insertions, 6 deletions
diff --git a/sys/dev/firewire/fwcrom.c b/sys/dev/firewire/fwcrom.c index 024bbb8..45bedee 100644 --- a/sys/dev/firewire/fwcrom.c +++ b/sys/dev/firewire/fwcrom.c @@ -38,6 +38,11 @@ __FBSDID("$FreeBSD$"); #endif #include <sys/param.h> + +#ifdef _BOOT +#include <stand.h> +#include <bootstrap.h> +#else #if defined(_KERNEL) || defined(TEST) #include <sys/queue.h> #endif @@ -52,6 +57,7 @@ __FBSDID("$FreeBSD$"); #include <stdlib.h> #include <string.h> #endif +#endif #ifdef __DragonFly__ #include "firewire.h" @@ -235,7 +241,7 @@ crom_crc(uint32_t *ptr, int len) return((uint16_t) crc); } -#ifndef _KERNEL +#if !defined(_KERNEL) && !defined(_BOOT) static void crom_desc_specver(uint32_t spec, uint32_t ver, char *buf, int len) { @@ -383,7 +389,7 @@ crom_desc(struct crom_context *cc, char *buf, int len) } #endif -#if defined(_KERNEL) || defined(TEST) +#if defined(_KERNEL) || defined(_BOOT) || defined(TEST) int crom_add_quad(struct crom_chunk *chunk, uint32_t entry) @@ -483,7 +489,7 @@ crom_load(struct crom_src *src, uint32_t *buf, int maxlen) { struct crom_chunk *chunk, *parent; struct csrhdr *hdr; -#ifdef _KERNEL +#if defined(_KERNEL) || defined(_BOOT) uint32_t *ptr; int i; #endif @@ -524,7 +530,7 @@ crom_load(struct crom_src *src, uint32_t *buf, int maxlen) hdr->crc_len = count - 1; hdr->crc = crom_crc(&buf[1], hdr->crc_len); -#ifdef _KERNEL +#if defined(_KERNEL) || defined(_BOOT) /* byte swap */ ptr = buf; for (i = 0; i < count; i ++) { diff --git a/sys/dev/firewire/iec13213.h b/sys/dev/firewire/iec13213.h index 7441725..5cafc8d 100644 --- a/sys/dev/firewire/iec13213.h +++ b/sys/dev/firewire/iec13213.h @@ -217,12 +217,12 @@ uint16_t crom_crc(uint32_t *r, int); struct csrreg *crom_search_key(struct crom_context *, uint8_t); int crom_has_specver(uint32_t *, uint32_t, uint32_t); -#ifndef _KERNEL +#if !defined(_KERNEL) && !defined(_BOOT) char *crom_desc(struct crom_context *, char *, int); #endif /* For CROM build */ -#if defined(_KERNEL) || defined(TEST) +#if defined(_KERNEL) || defined(_BOOT) || defined(TEST) #define CROM_MAX_CHUNK_LEN 20 struct crom_src { struct csrhdr hdr; |
