Module Name: src
Committed By: ahoka
Date: Mon Apr 4 18:24:56 UTC 2011
Modified Files:
src/sys/compat/netbsd32: netbsd32_ioctl.c netbsd32_ioctl.h
Log Message:
remove FLASH_GET_INFO compat as it is no longer using size_t
To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 src/sys/compat/netbsd32/netbsd32_ioctl.c
cvs rdiff -u -r1.34 -r1.35 src/sys/compat/netbsd32/netbsd32_ioctl.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/netbsd32/netbsd32_ioctl.c
diff -u src/sys/compat/netbsd32/netbsd32_ioctl.c:1.55 src/sys/compat/netbsd32/netbsd32_ioctl.c:1.56
--- src/sys/compat/netbsd32/netbsd32_ioctl.c:1.55 Sat Mar 19 04:07:35 2011
+++ src/sys/compat/netbsd32/netbsd32_ioctl.c Mon Apr 4 18:24:56 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_ioctl.c,v 1.55 2011/03/19 04:07:35 cliff Exp $ */
+/* $NetBSD: netbsd32_ioctl.c,v 1.56 2011/04/04 18:24:56 ahoka Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_ioctl.c,v 1.55 2011/03/19 04:07:35 cliff Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_ioctl.c,v 1.56 2011/04/04 18:24:56 ahoka Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -51,7 +51,6 @@
#include <sys/ktrace.h>
#include <sys/kmem.h>
#include <sys/envsys.h>
-#include <sys/flashio.h>
#ifdef __sparc__
#include <dev/sun/fbio.h>
@@ -443,26 +442,6 @@
*s32p = (netbsd32_u_long)*p;
}
-static inline void
-netbsd32_to_flash_info_params(struct netbsd32_flash_info_params *s32p,
- struct flash_info_params *p, u_long cmd)
-{
- p->ip_flash_size = s32p->ip_flash_size;
- p->ip_page_size = (size_t)s32p->ip_page_size;
- p->ip_erase_size = (size_t)s32p->ip_erase_size;
- p->ip_flash_type = s32p->ip_flash_type;
-}
-
-static inline void
-netbsd32_from_flash_info_params(struct flash_info_params *p,
- struct netbsd32_flash_info_params *s32p, u_long cmd)
-{
- s32p->ip_flash_size = p->ip_flash_size;
- s32p->ip_page_size = (netbsd32_size_t)p->ip_page_size;
- s32p->ip_erase_size = (netbsd32_size_t)p->ip_erase_size;
- s32p->ip_flash_type = p->ip_flash_type;
-}
-
/*
* main ioctl syscall.
*
@@ -764,9 +743,6 @@
case ENVSYS_REMOVEPROPS32:
IOCTL_STRUCT_CONV_TO(ENVSYS_REMOVEPROPS, plistref);
- case FLASH_GET_INFO32:
- IOCTL_STRUCT_CONV_TO(FLASH_GET_INFO, flash_info_params);
-
default:
#ifdef NETBSD32_MD_IOCTL
error = netbsd32_md_ioctl(fp, com, data32, l);
Index: src/sys/compat/netbsd32/netbsd32_ioctl.h
diff -u src/sys/compat/netbsd32/netbsd32_ioctl.h:1.34 src/sys/compat/netbsd32/netbsd32_ioctl.h:1.35
--- src/sys/compat/netbsd32/netbsd32_ioctl.h:1.34 Mon Apr 4 17:46:22 2011
+++ src/sys/compat/netbsd32/netbsd32_ioctl.h Mon Apr 4 18:24:56 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_ioctl.h,v 1.34 2011/04/04 17:46:22 ahoka Exp $ */
+/* $NetBSD: netbsd32_ioctl.h,v 1.35 2011/04/04 18:24:56 ahoka Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -29,7 +29,6 @@
#include <sys/device.h>
#include <sys/disklabel.h>
#include <sys/disk.h>
-#include <sys/flashio.h>
#include <net/zlib.h>
@@ -393,12 +392,3 @@
#define ENVSYS_GETDICTIONARY32 _IOWR('E', 0, struct netbsd32_plistref)
#define ENVSYS_SETDICTIONARY32 _IOWR('E', 1, struct netbsd32_plistref)
#define ENVSYS_REMOVEPROPS32 _IOWR('E', 2, struct netbsd32_plistref)
-
-/* from <sys/flashio.h> */
-struct netbsd32_flash_info_params {
- flash_off_t ip_flash_size;
- netbsd32_size_t ip_page_size;
- netbsd32_size_t ip_erase_size;
- uint8_t ip_flash_type;
-};
-#define FLASH_GET_INFO32 _IOWR('&', 2, struct netbsd32_flash_info_params)
