Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f7c80c9f authored by Olaf Hering's avatar Olaf Hering Committed by Linus Torvalds
Browse files

[PATCH] aic byteorder fixes after recent cleanup 



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: default avatarOlaf Hering <olh@suse.de>
Acked-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent f7d1d23c

drivers/scsi/aic7xxx/aicasm/aicasm.c

+2 −2
Original line number Diff line number Diff line
@@ -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],
@@ -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],

drivers/scsi/aic7xxx/aicasm/aicasm_insformat.h

+5 −3
Original line number Diff line number Diff line
@@ -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,
@@ -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,
@@ -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,