From ca9af7f1e35ee6e34da1a7307f0465fe70dda49d Mon Sep 17 00:00:00 2001 From: Frank Mori Hess Date: Sat, 18 Oct 2003 21:29:27 +0000 Subject: [PATCH] make it compile without firmware header (but it wont work of course) --- comedi/drivers/me4000.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/comedi/drivers/me4000.c b/comedi/drivers/me4000.c index 4fc1d91b..1cc3c01b 100644 --- a/comedi/drivers/me4000.c +++ b/comedi/drivers/me4000.c @@ -52,8 +52,10 @@ Configuration Options: #include #include "me4000.h" +#if 0 +/* file removed due to GPL incompatibility */ #include "me4000_fw.h" - +#endif me4000_board_t me4000_boards[] = { { "ME-4650" , 0x4650, { 0, 0 }, { 16, 0, 0, 0 }, { 4 }, { 0 } }, @@ -740,14 +742,16 @@ static int xilinx_download(comedi_device *dev){ value = inl(info->plx_regbase + PLX_ICR); value &= ~0x100; outl(value, info->plx_regbase + PLX_ICR); - +#if 1 + comedi_error(dev, "xilinx firmware unavailable due to licensing, aborting"); + return -EIO; +#else /* Download Xilinx firmware */ size = (xilinx_firm[0] << 24) + (xilinx_firm[1] << 16) + (xilinx_firm[2] << 8) + xilinx_firm[3]; udelay(10); for(idx = 0; idx < size; idx++){ outb(xilinx_firm[16+idx], info->program_regbase); - udelay(10); /* Check if BUSY flag is low */ @@ -756,6 +760,7 @@ static int xilinx_download(comedi_device *dev){ return -EIO; } } +#endif /* If done flag is high download was successful */ if (inl(info->plx_regbase + PLX_ICR) & 0x4){ -- 2.26.2