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

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

zorro/UAPI: Use proper types (endianness/size) in <linux/zorro.h> 



Fix member definitions for non-native userspace handling:
  - All multi-byte values are big-endian, hence use __be*,
  - All pointers are 32-bit pointers under AmigaOS, but unused (except for
    cd_BoardAddr) under Linux, hence use __be32.

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

arch/m68k/amiga/config.c

+5 −4
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include <linux/keyboard.h>



#include <asm/bootinfo.h>

#include <asm/byteorder.h>

#include <asm/setup.h>

#include <asm/pgtable.h>

#include <asm/amigahw.h>
@@ -176,10 +177,10 @@ int __init amiga_parse_bootinfo(const struct bi_record *record) 
			const struct ConfigDev *cd = (struct ConfigDev *)data;

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

			dev->rom = cd->cd_Rom;

			dev->slotaddr = cd->cd_SlotAddr;

			dev->slotsize = cd->cd_SlotSize;

			dev->boardaddr = (u32)cd->cd_BoardAddr;

			dev->boardsize = cd->cd_BoardSize;

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

			dev->slotsize = be16_to_cpu(cd->cd_SlotSize);

			dev->boardaddr = be32_to_cpu(cd->cd_BoardAddr);

			dev->boardsize = be32_to_cpu(cd->cd_BoardSize);

		} else

			printk("amiga_parse_bootinfo: too many AutoConfig devices\n");

#endif /* CONFIG_ZORRO */

arch/m68k/amiga/platform.c

+6 −3
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 


#include <asm/amigahw.h>

#include <asm/amigayle.h>

#include <asm/byteorder.h>





#ifdef CONFIG_ZORRO
@@ -66,10 +67,12 @@ static int __init z_dev_present(zorro_id id) 
{

	unsigned int i;



	for (i = 0; i < zorro_num_autocon; i++)

		if (zorro_autocon_init[i].rom.er_Manufacturer == ZORRO_MANUF(id) &&

		    zorro_autocon_init[i].rom.er_Product == ZORRO_PROD(id))

	for (i = 0; i < zorro_num_autocon; i++) {

		const struct ExpansionRom *rom = &zorro_autocon_init[i].rom;

		if (be16_to_cpu(rom->er_Manufacturer) == ZORRO_MANUF(id) &&

		    rom->er_Product == ZORRO_PROD(id))

			return 1;

	}



	return 0;

}

drivers/net/ethernet/amd/a2065.c

+6 −3
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ 
#include <linux/zorro.h>

#include <linux/bitops.h>



#include <asm/byteorder.h>

#include <asm/irq.h>

#include <asm/amigaints.h>

#include <asm/amigahw.h>
@@ -678,6 +679,7 @@ static int a2065_init_one(struct zorro_dev *z, 
	unsigned long base_addr = board + A2065_LANCE;

	unsigned long mem_start = board + A2065_RAM;

	struct resource *r1, *r2;

	u32 serial;

	int err;



	r1 = request_mem_region(base_addr, sizeof(struct lance_regs),
@@ -702,6 +704,7 @@ static int a2065_init_one(struct zorro_dev *z, 
	r1->name = dev->name;

	r2->name = dev->name;



	serial = be32_to_cpu(z->rom.er_SerialNumber);

	dev->dev_addr[0] = 0x00;

	if (z->id != ZORRO_PROD_AMERISTAR_A2065) {	/* Commodore */

		dev->dev_addr[1] = 0x80;
@@ -710,9 +713,9 @@ static int a2065_init_one(struct zorro_dev *z, 
		dev->dev_addr[1] = 0x00;

		dev->dev_addr[2] = 0x9f;

	}

	dev->dev_addr[3] = (z->rom.er_SerialNumber >> 16) & 0xff;

	dev->dev_addr[4] = (z->rom.er_SerialNumber >> 8) & 0xff;

	dev->dev_addr[5] = z->rom.er_SerialNumber & 0xff;

	dev->dev_addr[3] = (serial >> 16) & 0xff;

	dev->dev_addr[4] = (serial >> 8) & 0xff;

	dev->dev_addr[5] = serial & 0xff;

	dev->base_addr = (unsigned long)ZTWO_VADDR(base_addr);

	dev->mem_start = (unsigned long)ZTWO_VADDR(mem_start);

	dev->mem_end = dev->mem_start + A2065_RAM_SIZE;

drivers/net/ethernet/amd/ariadne.c

+6 −3
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ 
#include <linux/zorro.h>

#include <linux/bitops.h>



#include <asm/byteorder.h>

#include <asm/amigaints.h>

#include <asm/amigahw.h>

#include <asm/irq.h>
@@ -718,6 +719,7 @@ static int ariadne_init_one(struct zorro_dev *z, 
	struct resource *r1, *r2;

	struct net_device *dev;

	struct ariadne_private *priv;

	u32 serial;

	int err;



	r1 = request_mem_region(base_addr, sizeof(struct Am79C960), "Am79C960");
@@ -741,12 +743,13 @@ static int ariadne_init_one(struct zorro_dev *z, 
	r1->name = dev->name;

	r2->name = dev->name;



	serial = be32_to_cpu(z->rom.er_SerialNumber);

	dev->dev_addr[0] = 0x00;

	dev->dev_addr[1] = 0x60;

	dev->dev_addr[2] = 0x30;

	dev->dev_addr[3] = (z->rom.er_SerialNumber >> 16) & 0xff;

	dev->dev_addr[4] = (z->rom.er_SerialNumber >> 8) & 0xff;

	dev->dev_addr[5] = z->rom.er_SerialNumber & 0xff;

	dev->dev_addr[3] = (serial >> 16) & 0xff;

	dev->dev_addr[4] = (serial >> 8) & 0xff;

	dev->dev_addr[5] = serial & 0xff;

	dev->base_addr = (unsigned long)ZTWO_VADDR(base_addr);

	dev->mem_start = (unsigned long)ZTWO_VADDR(mem_start);

	dev->mem_end = dev->mem_start + ARIADNE_RAM_SIZE;

drivers/zorro/proc.c

+6 −4
Original line number Diff line number Diff line
@@ -14,6 +14,8 @@ 
#include <linux/seq_file.h>

#include <linux/init.h>

#include <linux/export.h>



#include <asm/byteorder.h>

#include <asm/uaccess.h>

#include <asm/amigahw.h>

#include <asm/setup.h>
@@ -41,10 +43,10 @@ proc_bus_zorro_read(struct file *file, char __user *buf, size_t nbytes, loff_t * 
	/* Construct a ConfigDev */

	memset(&cd, 0, sizeof(cd));

	cd.cd_Rom = z->rom;

	cd.cd_SlotAddr = z->slotaddr;

	cd.cd_SlotSize = z->slotsize;

	cd.cd_BoardAddr = (void *)zorro_resource_start(z);

	cd.cd_BoardSize = zorro_resource_len(z);

	cd.cd_SlotAddr = cpu_to_be16(z->slotaddr);

	cd.cd_SlotSize = cpu_to_be16(z->slotsize);

	cd.cd_BoardAddr = cpu_to_be32(zorro_resource_start(z));

	cd.cd_BoardSize = cpu_to_be32(zorro_resource_len(z));



	if (copy_to_user(buf, (void *)&cd + pos, nbytes))

		return -EFAULT;