-// $Id: vmax301.c,v 1.30 2004/07/12 22:38:29 dwmw2 Exp $
+// $Id: vmax301.c,v 1.28 2003/05/21 15:15:08 dwmw2 Exp $
/* ######################################################################
Tempustech VMAX SBC301 MTD Driver.
__vmax301_page(map, page);
}
-static map_word vmax301_read8(struct map_info *map, unsigned long ofs)
+static __u8 vmax301_read8(struct map_info *map, unsigned long ofs)
{
- map_word ret;
+ __u8 ret;
spin_lock(&vmax301_spin);
vmax301_page(map, ofs);
- ret.x[0] = readb(map->map_priv_2 + (ofs & WINDOW_MASK));
+ ret = readb(map->map_priv_2 + (ofs & WINDOW_MASK));
+ spin_unlock(&vmax301_spin);
+ return ret;
+}
+
+static __u16 vmax301_read16(struct map_info *map, unsigned long ofs)
+{
+ __u16 ret;
+ spin_lock(&vmax301_spin);
+ vmax301_page(map, ofs);
+ ret = readw(map->map_priv_2 + (ofs & WINDOW_MASK));
+ spin_unlock(&vmax301_spin);
+ return ret;
+}
+
+static __u32 vmax301_read32(struct map_info *map, unsigned long ofs)
+{
+ __u32 ret;
+ spin_lock(&vmax301_spin);
+ vmax301_page(map, ofs);
+ ret = readl(map->map_priv_2 + (ofs & WINDOW_MASK));
spin_unlock(&vmax301_spin);
return ret;
}
}
}
-static void vmax301_write8(struct map_info *map, map_word d, unsigned long adr)
+static void vmax301_write8(struct map_info *map, __u8 d, unsigned long adr)
+{
+ spin_lock(&vmax301_spin);
+ vmax301_page(map, adr);
+ writeb(d, map->map_priv_2 + (adr & WINDOW_MASK));
+ spin_unlock(&vmax301_spin);
+}
+
+static void vmax301_write16(struct map_info *map, __u16 d, unsigned long adr)
+{
+ spin_lock(&vmax301_spin);
+ vmax301_page(map, adr);
+ writew(d, map->map_priv_2 + (adr & WINDOW_MASK));
+ spin_unlock(&vmax301_spin);
+}
+
+static void vmax301_write32(struct map_info *map, __u32 d, unsigned long adr)
{
spin_lock(&vmax301_spin);
vmax301_page(map, adr);
- writeb(d.x[0], map->map_priv_2 + (adr & WINDOW_MASK));
+ writel(d, map->map_priv_2 + (adr & WINDOW_MASK));
spin_unlock(&vmax301_spin);
}
.name = "VMAX301 Internal Flash",
.phys = NO_XIP,
.size = 3*2*1024*1024,
- .bankwidth = 1,
- .read = vmax301_read8,
+ .buswidth = 1,
+ .read8 = vmax301_read8,
+ .read16 = vmax301_read16,
+ .read32 = vmax301_read32,
.copy_from = vmax301_copy_from,
- .write = vmax301_write8,
+ .write8 = vmax301_write8,
+ .write16 = vmax301_write16,
+ .write32 = vmax301_write32,
.copy_to = vmax301_copy_to,
.map_priv_1 = WINDOW_START + WINDOW_LENGTH,
.map_priv_2 = 0xFFFFFFFF
.name = "VMAX301 Socket",
.phys = NO_XIP,
.size = 0,
- .bankwidth = 1,
- .read = vmax301_read8,
+ .buswidth = 1,
+ .read8 = vmax301_read8,
+ .read16 = vmax301_read16,
+ .read32 = vmax301_read32,
.copy_from = vmax301_copy_from,
- .write = vmax301_write8,
+ .write8 = vmax301_write8,
+ .write16 = vmax301_write16,
+ .write32 = vmax301_write32,
.copy_to = vmax301_copy_to,
.map_priv_1 = WINDOW_START + (3*WINDOW_LENGTH),
.map_priv_2 = 0xFFFFFFFF