d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Respect _BOOT flag.

Browse Source
This commit is contained in:
simokawa 2004-10-22 15:39:39 +00:00
parent 251f5975d3
commit d731e713ca
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/dev/firewire/fwcrom.c
View File

@ -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 ++) {

4
sys/dev/firewire/iec13213.h
View File

@ -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;