Module Name: src
Committed By: dyoung
Date: Wed May 25 22:58:29 UTC 2011
Modified Files:
src/sys/sys: bus_proto.h
Log Message:
Add some missing prototypes for streaming routines.
Correct some bus_space_*_8 prototypes that used uint32_t instead of
uint64_t.
Replace size_t with bus_size_t where that's what bus_space(9) calls for.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/sys/bus_proto.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/sys/bus_proto.h
diff -u src/sys/sys/bus_proto.h:1.4 src/sys/sys/bus_proto.h:1.5
--- src/sys/sys/bus_proto.h:1.4 Wed Apr 28 19:51:16 2010
+++ src/sys/sys/bus_proto.h Wed May 25 22:58:29 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_proto.h,v 1.4 2010/04/28 19:51:16 dyoung Exp $ */
+/* $NetBSD: bus_proto.h,v 1.5 2011/05/25 22:58:29 dyoung Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2001, 2007 The NetBSD Foundation, Inc.
@@ -156,9 +156,9 @@
bus_size_t, uint32_t *, bus_size_t);
void bus_space_read_multi_8(bus_space_tag_t, bus_space_handle_t,
- bus_size_t, uint32_t *, bus_size_t);
+ bus_size_t, uint64_t *, bus_size_t);
void bus_space_read_multi_stream_8(bus_space_tag_t, bus_space_handle_t,
- bus_size_t, uint32_t *, bus_size_t);
+ bus_size_t, uint64_t *, bus_size_t);
void bus_space_read_region_8(bus_space_tag_t, bus_space_handle_t,
bus_size_t, uint64_t *, bus_size_t);
void bus_space_read_region_stream_8(bus_space_tag_t, bus_space_handle_t,
@@ -224,10 +224,10 @@
bus_size_t);
void bus_space_write_multi_8(bus_space_tag_t, bus_space_handle_t,
- bus_size_t, const uint32_t *,
+ bus_size_t, const uint64_t *,
bus_size_t);
void bus_space_write_multi_stream_8(bus_space_tag_t, bus_space_handle_t,
- bus_size_t, const uint32_t *,
+ bus_size_t, const uint64_t *,
bus_size_t);
void bus_space_write_region_8(bus_space_tag_t, bus_space_handle_t,
bus_size_t, const uint64_t *,
@@ -237,36 +237,66 @@
bus_size_t);
void bus_space_set_multi_1(bus_space_tag_t, bus_space_handle_t,
- bus_size_t, u_int8_t, size_t);
+ bus_size_t, u_int8_t, bus_size_t);
void bus_space_set_multi_2(bus_space_tag_t, bus_space_handle_t,
- bus_size_t, u_int16_t, size_t);
+ bus_size_t, u_int16_t, bus_size_t);
void bus_space_set_multi_4(bus_space_tag_t, bus_space_handle_t,
- bus_size_t, u_int32_t, size_t);
+ bus_size_t, u_int32_t, bus_size_t);
void bus_space_set_multi_8(bus_space_tag_t, bus_space_handle_t,
- bus_size_t, u_int64_t, size_t);
+ bus_size_t, u_int64_t, bus_size_t);
+void bus_space_set_multi_stream_1(bus_space_tag_t, bus_space_handle_t,
+ bus_size_t, u_int8_t, bus_size_t);
+void bus_space_set_multi_stream_2(bus_space_tag_t, bus_space_handle_t,
+ bus_size_t, u_int16_t, bus_size_t);
+void bus_space_set_multi_stream_4(bus_space_tag_t, bus_space_handle_t,
+ bus_size_t, u_int32_t, bus_size_t);
+void bus_space_set_multi_stream_8(bus_space_tag_t, bus_space_handle_t,
+ bus_size_t, u_int64_t, bus_size_t);
void bus_space_set_region_1(bus_space_tag_t, bus_space_handle_t,
- bus_size_t, u_int8_t, size_t);
+ bus_size_t, u_int8_t, bus_size_t);
void bus_space_set_region_2(bus_space_tag_t, bus_space_handle_t,
- bus_size_t, u_int16_t, size_t);
+ bus_size_t, u_int16_t, bus_size_t);
void bus_space_set_region_4(bus_space_tag_t, bus_space_handle_t,
- bus_size_t, u_int32_t, size_t);
+ bus_size_t, u_int32_t, bus_size_t);
void bus_space_set_region_8(bus_space_tag_t, bus_space_handle_t,
- bus_size_t, u_int64_t, size_t);
+ bus_size_t, u_int64_t, bus_size_t);
+
+void bus_space_set_region_stream_1(bus_space_tag_t, bus_space_handle_t,
+ bus_size_t, u_int8_t, bus_size_t);
+void bus_space_set_region_stream_2(bus_space_tag_t, bus_space_handle_t,
+ bus_size_t, u_int16_t, bus_size_t);
+void bus_space_set_region_stream_4(bus_space_tag_t, bus_space_handle_t,
+ bus_size_t, u_int32_t, bus_size_t);
+void bus_space_set_region_stream_8(bus_space_tag_t, bus_space_handle_t,
+ bus_size_t, u_int64_t, bus_size_t);
void bus_space_copy_region_1(bus_space_tag_t, bus_space_handle_t,
bus_size_t, bus_space_handle_t,
- bus_size_t, size_t);
+ bus_size_t, bus_size_t);
void bus_space_copy_region_2(bus_space_tag_t, bus_space_handle_t,
bus_size_t, bus_space_handle_t,
- bus_size_t, size_t);
+ bus_size_t, bus_size_t);
void bus_space_copy_region_4(bus_space_tag_t, bus_space_handle_t,
bus_size_t, bus_space_handle_t,
- bus_size_t, size_t);
+ bus_size_t, bus_size_t);
void bus_space_copy_region_8(bus_space_tag_t, bus_space_handle_t,
bus_size_t, bus_space_handle_t,
- bus_size_t, size_t);
+ bus_size_t, bus_size_t);
+
+void bus_space_copy_region_stream_1(bus_space_tag_t, bus_space_handle_t,
+ bus_size_t, bus_space_handle_t,
+ bus_size_t, bus_size_t);
+void bus_space_copy_region_stream_2(bus_space_tag_t, bus_space_handle_t,
+ bus_size_t, bus_space_handle_t,
+ bus_size_t, bus_size_t);
+void bus_space_copy_region_stream_4(bus_space_tag_t, bus_space_handle_t,
+ bus_size_t, bus_space_handle_t,
+ bus_size_t, bus_size_t);
+void bus_space_copy_region_stream_8(bus_space_tag_t, bus_space_handle_t,
+ bus_size_t, bus_space_handle_t,
+ bus_size_t, bus_size_t);
/*
* bus_dma(9)
