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

Commit abe48101 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven
Browse files

m68k/UAPI: Use proper types (endianness/size) in <asm/bootinfo*.h> 



Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
parent cf288bd5

arch/m68k/amiga/config.c

+9 −9
Original line number Diff line number Diff line
@@ -145,37 +145,37 @@ static struct resource ram_resource[NUM_MEMINFO]; 
int __init amiga_parse_bootinfo(const struct bi_record *record)

{

	int unknown = 0;

	const unsigned long *data = record->data;

	const void *data = record->data;



	switch (record->tag) {

	switch (be16_to_cpu(record->tag)) {

	case BI_AMIGA_MODEL:

		amiga_model = *data;

		amiga_model = be32_to_cpup(data);

		break;



	case BI_AMIGA_ECLOCK:

		amiga_eclock = *data;

		amiga_eclock = be32_to_cpup(data);

		break;



	case BI_AMIGA_CHIPSET:

		amiga_chipset = *data;

		amiga_chipset = be32_to_cpup(data);

		break;



	case BI_AMIGA_CHIP_SIZE:

		amiga_chip_size = *(const int *)data;

		amiga_chip_size = be32_to_cpup(data);

		break;



	case BI_AMIGA_VBLANK:

		amiga_vblank = *(const unsigned char *)data;

		amiga_vblank = *(const __u8 *)data;

		break;



	case BI_AMIGA_PSFREQ:

		amiga_psfreq = *(const unsigned char *)data;

		amiga_psfreq = *(const __u8 *)data;

		break;



	case BI_AMIGA_AUTOCON:

#ifdef CONFIG_ZORRO

		if (zorro_num_autocon < ZORRO_NUM_AUTO) {

			const struct ConfigDev *cd = (struct ConfigDev *)data;

			const struct ConfigDev *cd = data;

			struct zorro_dev_init *dev = &zorro_autocon_init[zorro_num_autocon++];

			dev->rom = cd->cd_Rom;

			dev->slotaddr = be16_to_cpu(cd->cd_SlotAddr);

arch/m68k/apollo/config.c

+8 −7
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include <asm/setup.h>

#include <asm/bootinfo.h>

#include <asm/bootinfo-apollo.h>

#include <asm/byteorder.h>

#include <asm/pgtable.h>

#include <asm/apollohw.h>

#include <asm/irq.h>
@@ -48,11 +49,11 @@ static const char *apollo_models[] = { 
int __init apollo_parse_bootinfo(const struct bi_record *record)

{

	int unknown = 0;

	const unsigned long *data = record->data;

	const void *data = record->data;



	switch(record->tag) {

	switch (be16_to_cpu(record->tag)) {

	case BI_APOLLO_MODEL:

			apollo_model=*data;

		apollo_model = be32_to_cpup(data);

		break;



	default:

arch/m68k/atari/config.c

+5 −4
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ 


#include <asm/bootinfo.h>

#include <asm/bootinfo-atari.h>

#include <asm/byteorder.h>

#include <asm/setup.h>

#include <asm/atarihw.h>

#include <asm/atariints.h>
@@ -130,14 +131,14 @@ static int __init scc_test(volatile char *ctla) 
int __init atari_parse_bootinfo(const struct bi_record *record)

{

	int unknown = 0;

	const u_long *data = record->data;

	const void *data = record->data;



	switch (record->tag) {

	switch (be16_to_cpu(record->tag)) {

	case BI_ATARI_MCH_COOKIE:

		atari_mch_cookie = *data;

		atari_mch_cookie = be32_to_cpup(data);

		break;

	case BI_ATARI_MCH_TYPE:

		atari_mch_type = *data;

		atari_mch_type = be32_to_cpup(data);

		break;

	default:

		unknown = 1;

arch/m68k/bvme6000/config.c

+2 −1
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 


#include <asm/bootinfo.h>

#include <asm/bootinfo-vme.h>

#include <asm/byteorder.h>

#include <asm/pgtable.h>

#include <asm/setup.h>

#include <asm/irq.h>
@@ -53,7 +54,7 @@ static irq_handler_t tick_handler; 


int __init bvme6000_parse_bootinfo(const struct bi_record *bi)

{

	if (bi->tag == BI_VME_TYPE)

	if (be16_to_cpu(bi->tag) == BI_VME_TYPE)

		return 0;

	else

		return 1;

arch/m68k/hp300/config.c

+5 −4
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 


#include <asm/bootinfo.h>

#include <asm/bootinfo-hp300.h>

#include <asm/byteorder.h>

#include <asm/machdep.h>

#include <asm/blinken.h>

#include <asm/io.h>                               /* readb() and writeb() */
@@ -71,15 +72,15 @@ extern int hp300_setup_serial_console(void) __init; 
int __init hp300_parse_bootinfo(const struct bi_record *record)

{

	int unknown = 0;

	const unsigned long *data = record->data;

	const void *data = record->data;



	switch (record->tag) {

	switch (be16_to_cpu(record->tag)) {

	case BI_HP300_MODEL:

		hp300_model = *data;

		hp300_model = be32_to_cpup(data);

		break;



	case BI_HP300_UART_SCODE:

		hp300_uart_scode = *data;

		hp300_uart_scode = be32_to_cpup(data);

		break;



	case BI_HP300_UART_ADDR: