Module Name: src
Committed By: dyoung
Date: Mon Mar 15 19:48:31 UTC 2010
Modified Files:
src/sys/dev/cardbus: cardbus_map.c cardbusvar.h
Log Message:
Delete unused functions cardbus_save_bar() and cardbus_restore_bar().
To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/sys/dev/cardbus/cardbus_map.c
cvs rdiff -u -r1.52 -r1.53 src/sys/dev/cardbus/cardbusvar.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/dev/cardbus/cardbus_map.c
diff -u src/sys/dev/cardbus/cardbus_map.c:1.35 src/sys/dev/cardbus/cardbus_map.c:1.36
--- src/sys/dev/cardbus/cardbus_map.c:1.35 Thu Mar 4 22:42:22 2010
+++ src/sys/dev/cardbus/cardbus_map.c Mon Mar 15 19:48:31 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: cardbus_map.c,v 1.35 2010/03/04 22:42:22 dyoung Exp $ */
+/* $NetBSD: cardbus_map.c,v 1.36 2010/03/15 19:48:31 dyoung Exp $ */
/*
* Copyright (c) 1999 and 2000
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cardbus_map.c,v 1.35 2010/03/04 22:42:22 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cardbus_map.c,v 1.36 2010/03/15 19:48:31 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -336,55 +336,3 @@
return st;
}
-
-
-
-
-
-/*
- * int cardbus_save_bar(cardbus_devfunc_t);
- *
- * This function saves the Base Address Registers at the CardBus
- * function denoted by the argument.
- */
-int cardbus_save_bar(cardbus_devfunc_t ct)
-{
- pcitag_t tag = Cardbus_make_tag(ct);
- cardbus_chipset_tag_t cc = ct->ct_cc;
- cardbus_function_tag_t cf = ct->ct_cf;
-
- ct->ct_bar[0] = cardbus_conf_read(cc, cf, tag, PCI_BAR0);
- ct->ct_bar[1] = cardbus_conf_read(cc, cf, tag, PCI_BAR1);
- ct->ct_bar[2] = cardbus_conf_read(cc, cf, tag, PCI_BAR2);
- ct->ct_bar[3] = cardbus_conf_read(cc, cf, tag, PCI_BAR3);
- ct->ct_bar[4] = cardbus_conf_read(cc, cf, tag, PCI_BAR4);
- ct->ct_bar[5] = cardbus_conf_read(cc, cf, tag, PCI_BAR5);
-
- DPRINTF(("cardbus_save_bar: %x %x\n", ct->ct_bar[0], ct->ct_bar[1]));
-
- return 0;
-}
-
-
-
-/*
- * int cardbus_restore_bar(cardbus_devfunc_t);
- *
- * This function saves the Base Address Registers at the CardBus
- * function denoted by the argument.
- */
-int cardbus_restore_bar(cardbus_devfunc_t ct)
-{
- pcitag_t tag = Cardbus_make_tag(ct);
- cardbus_chipset_tag_t cc = ct->ct_cc;
- cardbus_function_tag_t cf = ct->ct_cf;
-
- cardbus_conf_write(cc, cf, tag, PCI_BAR0, ct->ct_bar[0]);
- cardbus_conf_write(cc, cf, tag, PCI_BAR1, ct->ct_bar[1]);
- cardbus_conf_write(cc, cf, tag, PCI_BAR2, ct->ct_bar[2]);
- cardbus_conf_write(cc, cf, tag, PCI_BAR3, ct->ct_bar[3]);
- cardbus_conf_write(cc, cf, tag, PCI_BAR4, ct->ct_bar[4]);
- cardbus_conf_write(cc, cf, tag, PCI_BAR5, ct->ct_bar[5]);
-
- return 0;
-}
Index: src/sys/dev/cardbus/cardbusvar.h
diff -u src/sys/dev/cardbus/cardbusvar.h:1.52 src/sys/dev/cardbus/cardbusvar.h:1.53
--- src/sys/dev/cardbus/cardbusvar.h:1.52 Mon Mar 15 19:43:17 2010
+++ src/sys/dev/cardbus/cardbusvar.h Mon Mar 15 19:48:31 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: cardbusvar.h,v 1.52 2010/03/15 19:43:17 dyoung Exp $ */
+/* $NetBSD: cardbusvar.h,v 1.53 2010/03/15 19:48:31 dyoung Exp $ */
/*
* Copyright (c) 1998, 1999 and 2000
@@ -279,9 +279,6 @@
int cardbus_mapreg_unmap(struct cardbus_softc *, int, int,
bus_space_tag_t, bus_space_handle_t, bus_size_t);
-int cardbus_save_bar(cardbus_devfunc_t);
-int cardbus_restore_bar(cardbus_devfunc_t);
-
int cardbus_function_enable(struct cardbus_softc *, int);
int cardbus_function_disable(struct cardbus_softc *, int);
