summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authorbde <bde@FreeBSD.org>1996-09-30 11:25:19 +0000
committerbde <bde@FreeBSD.org>1996-09-30 11:25:19 +0000
commit834343f74ce229a4be1fd61ff3f3af741dfeb628 (patch)
treebdcedd525f5a8f1a769b01112a69e8189143dbf6 /sys
parent4a1af9f20b6ae22ea5b0d773346439dc3d23f6e6 (diff)
downloadFreeBSD-src-834343f74ce229a4be1fd61ff3f3af741dfeb628.zip
FreeBSD-src-834343f74ce229a4be1fd61ff3f3af741dfeb628.tar.gz
Whaddya know, visual userconfig sort of supports pci, but the support
was always disabled because "pci.h" wasn't included. Now the configured pci devices are listed and you can edit bogus flags for them. Fixed bitrot in the disabled code. A used #include was removed and const poisoning wasn't fixed. Removed unused #include.
Diffstat (limited to 'sys')
-rw-r--r--sys/i386/i386/userconfig.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/sys/i386/i386/userconfig.c b/sys/i386/i386/userconfig.c
index 4b5a0ba..fb2091b 100644
--- a/sys/i386/i386/userconfig.c
+++ b/sys/i386/i386/userconfig.c
@@ -46,7 +46,7 @@
** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
** THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
**
- ** $Id: userconfig.c,v 1.46 1996/09/15 19:35:23 phk Exp $
+ ** $Id: userconfig.c,v 1.47 1996/09/19 08:32:37 phk Exp $
**/
/**
@@ -104,12 +104,13 @@
**/
#include "opt_userconfig.h"
+#include "pci.h"
#include <sys/param.h>
#include <sys/systm.h>
+#include <sys/kernel.h>
#include <sys/malloc.h>
-#include <machine/clock.h>
#include <machine/cons.h>
#include <machine/md_var.h>
@@ -380,9 +381,9 @@ getdevs(void)
{
if (pcidevice_set.ls_items[i])
{
- if (((struct pci_device *)pcidevice_set.ls_items[i])->pd_name)
+ if (((const struct pci_device *)pcidevice_set.ls_items[i])->pd_name)
{
- strcpy(scratch.dev,((struct pci_device *)pcidevice_set.ls_items[i])->pd_name);
+ strcpy(scratch.dev,((const struct pci_device *)pcidevice_set.ls_items[i])->pd_name);
scratch.iobase = -2; /* mark as PCI for future reference */
scratch.irq = -2;
scratch.drq = -2;
@@ -2154,7 +2155,7 @@ visuserconfig(void)
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: userconfig.c,v 1.46 1996/09/15 19:35:23 phk Exp $
+ * $Id: userconfig.c,v 1.47 1996/09/19 08:32:37 phk Exp $
*/
#include "scbus.h"
OpenPOWER on IntegriCloud