Skip to content

Commit

Permalink
[PATCH] aic byteorder fixes after recent cleanup
Browse files Browse the repository at this point in the history
Rebuild the aic7xxx firmware doesn't work anymore after this change
which appeared int 2.6.13-rc1:

   [SCSI] aic7xxx/aic79xx: remove useless byte order macro cruft

Two files did not include byteorder.h, resulting in aic dying with a panic

	"Unknown opcode encountered in seq program"

This fixes it for me.

Signed-off-by: Olaf Hering <olh@suse.de>
Acked-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  • Loading branch information
Olaf Hering authored and Linus Torvalds committed Aug 2, 2005
1 parent f7d1d23 commit f7c80c9
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
4 changes: 2 additions & 2 deletions drivers/scsi/aic7xxx/aicasm/aicasm.c
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,7 @@ output_code()

fprintf(ofile, "%s\t0x%02x, 0x%02x, 0x%02x, 0x%02x",
cur_instr == STAILQ_FIRST(&seq_program) ? "" : ",\n",
#if BYTE_ORDER == LITTLE_ENDIAN
#ifdef __LITTLE_ENDIAN
cur_instr->format.bytes[0],
cur_instr->format.bytes[1],
cur_instr->format.bytes[2],
Expand Down Expand Up @@ -613,7 +613,7 @@ output_listing(char *ifilename)
line++;
}
fprintf(listfile, "%03x %02x%02x%02x%02x", instrptr,
#if BYTE_ORDER == LITTLE_ENDIAN
#ifdef __LITTLE_ENDIAN
cur_instr->format.bytes[0],
cur_instr->format.bytes[1],
cur_instr->format.bytes[2],
Expand Down
8 changes: 5 additions & 3 deletions drivers/scsi/aic7xxx/aicasm/aicasm_insformat.h
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,10 @@
* $FreeBSD$
*/

#include <asm/byteorder.h>

struct ins_format1 {
#if BYTE_ORDER == LITTLE_ENDIAN
#ifdef __LITTLE_ENDIAN
uint32_t immediate : 8,
source : 9,
destination : 9,
Expand All @@ -61,7 +63,7 @@ struct ins_format1 {
};

struct ins_format2 {
#if BYTE_ORDER == LITTLE_ENDIAN
#ifdef __LITTLE_ENDIAN
uint32_t shift_control : 8,
source : 9,
destination : 9,
Expand All @@ -79,7 +81,7 @@ struct ins_format2 {
};

struct ins_format3 {
#if BYTE_ORDER == LITTLE_ENDIAN
#ifdef __LITTLE_ENDIAN
uint32_t immediate : 8,
source : 9,
address : 10,
Expand Down

0 comments on commit f7c80c9

Please sign in to comment.