From nobody Sun Feb 8 01:19:24 2026 Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E3C8BEC0 for ; Sat, 11 Jan 2025 16:05:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736611538; cv=none; b=HLYnmWuBPOCAjOPUzMailJAX/2m+KiEZRO/0NTJqBnyoLcsTCBqv71zpK7wMm2kW3HSlOhSnGuGnfQxBhzO3CCZ+/CWIZdBf9YDWivr1/+g/izWJ/GsbDBIfFJuY4T2yud3NsOgY9fQMnIUb3jYF0CV2KLGUP9EB6/+xjtreTkU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736611538; c=relaxed/simple; bh=G+OsBxmOcpBrTcEkFH42FGmEipuKbGfY171U5/iYnew=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=fxL4D3vriuGEpF+mWqaxwNNjyhJR/d+3h2a6s2g2MpeF3jSJDbuppapjJvbuJ3uZ9Q/YrWIiTwPN10oFFfwi59lzMTfNANGLI34qrMvDgw2TG4QrehF7ZvLn5vzkfetD7B/Isfu8C1Yz6ZMxbOHIZsOZpeeL6U+3dpSeAaDvsYY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=GmV5yWT7; arc=none smtp.client-ip=209.85.128.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="GmV5yWT7" Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-43618283d48so21813835e9.1 for ; Sat, 11 Jan 2025 08:05:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1736611531; x=1737216331; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=a48ftmOQojJa5g2ka+6c6Y3GY9N50qEVXbbHmqXdC0g=; b=GmV5yWT7R5i0q94CkXuvN26O9tuR15p9AiyPUffq0xSCv3bfmvP6M2KHd86miEP0hg wrlXSWFQKYe3GMjPjxWaROOWcgdYnBUFjCHHMlbrhQCa8+4/acQbe1QFwXVkIE/p+Zb6 gji/hEFZR2cCAf2ktyYw9meR3pQMc90NpZn/0aVJn+8L1kx42F694eN6Xr0YUs+h572B +5hGytjF/FiCbaUV6Dg8fRm35fY/KdeaF70U4iP4GMb0fPo4tG5W2KhL4n8upWRrb076 en8JBg458nhi8N78w7MrRDL2TtrIN7o5x/Z+lsQHBDhe34gx7qXSqlX0IUjveJige09P FRUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736611531; x=1737216331; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=a48ftmOQojJa5g2ka+6c6Y3GY9N50qEVXbbHmqXdC0g=; b=STxHnWNK5gTwT6/YGYZkVnMMAEmH/dV2UPsUJlrAW3zXsaKZRg0huPyUSLmpDvNJZT g8UJWy6z340/QchhAGWB2mu5uWoptcyKb6/45duXh/q2yiZJRTUL6UCMHmxiaKl4KSyX oKEpApb7YS8eR4lxkVnKqNPIr4B8mamym3Nt0DSazGEW2SS9FTfgXvgDmakAQlxH4Rdq X7vfo3d0LyjPkdHnv/Lo5iRgiCUEBAFeA3fqZhMJRzUQWUMyHuTgWU3Sv+AWc8A9oLYN TAYWePpaxW6GkqCa7D19MxQjdN+UbZ2BSe0pO9peJoFAu6nXvn95n4UAAvXFPCxHzUFM +kGw== X-Forwarded-Encrypted: i=1; AJvYcCXDYhx3Z81DVKdICJt+wn889vTLFilOj/2oZFxfbt9iyG1dW+99vzxw9QwWgbaRv5NY3lJI6MSyTDx7S2Y=@vger.kernel.org X-Gm-Message-State: AOJu0Yxam3lvoixV7zanABgp+885m+InE4T2X06N1H+W7UO06WrRWj1m xykuos30AiC70GZEVjtNI6cy/5/RQy2xpPJP6tNdFbJ4pTil4N9M/KDbEw== X-Gm-Gg: ASbGncuoAvCl08tBI9kT49Jm8EKY4Klty02RcHm42yy35DHAAIJbpJBpgBG9HkHXiiC QjYVQc3uRi1HNnauZySfY4EN9WV2ViXglL2c/CpdmxcradO47u6RzZRoOzhqkUc3NUGyT27ws5y xeghaDFibqrT3hALrjFcJppO5ABhQdFWHIjFONqjLVgFY2+PYFLwelEPeIq61ffOhGb4lLVWRai Iz6YyiLhNMiA7B0geOYWRnz0xY8b+8kikJ5kow0mjnmM41tzP4e7cFQfxdgFIo7 X-Google-Smtp-Source: AGHT+IG4lEsXy0l6JKwEJuFHjalZ+Q6jULffZi9UrUxgUCwnxtcMtmVRYWjRDLGgl8adv6RgiEu2/Q== X-Received: by 2002:a05:600c:3143:b0:434:a929:42bb with SMTP id 5b1f17b1804b1-436e26b9d45mr144269665e9.18.1736611530644; Sat, 11 Jan 2025 08:05:30 -0800 (PST) Received: from localhost.localdomain ([82.64.73.52]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-436e9e37d3bsm85714375e9.31.2025.01.11.08.05.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Jan 2025 08:05:28 -0800 (PST) From: Dave Penkler To: gregkh@linuxfoundation.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Cc: Dave Penkler Subject: [PATCH v3] staging: gpib: Modernize gpib_interface_t initialization and make static Date: Sat, 11 Jan 2025 17:05:14 +0100 Message-ID: <20250111160514.26954-1-dpenkler@gmail.com> X-Mailer: git-send-email 2.47.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" All interface drivers were using the old style initialization of this struct field : value; This generated the followng sparse warning, for example: agilent_82357a/agilent_82357a.c:1492:1: warning: obsolete struct initialize= r, use C99 syntax Change the initialization to use the C99 syntax .field =3D value; This also resolves the checkpatch constraint of no indentation These structs were also not declared as static, unnecessarily polluting the symbol namespace and generating the following sparse warnings, for example: agilent_82357a/agilent_82357a.c:1465:18: warning: symbol 'agilent_82357a_gp= ib_interface' was not declared. Should it be static? Declare them as static and remove any conflicting extern declarations in the corresponding include files. Signed-off-by: Dave Penkler --- v1 -> v2 Add subsystem prefix to subject v2 -> v3 handle pcmcia interfaces and isa bus drivers also .../gpib/agilent_82350b/agilent_82350b.c | 100 ++-- .../gpib/agilent_82350b/agilent_82350b.h | 2 - .../gpib/agilent_82357a/agilent_82357a.c | 56 +- drivers/staging/gpib/cb7210/cb7210.c | 464 ++++++++-------- drivers/staging/gpib/cb7210/cb7210.h | 5 - drivers/staging/gpib/cec/cec.h | 4 - drivers/staging/gpib/cec/cec_gpib.c | 52 +- drivers/staging/gpib/eastwood/fluke_gpib.c | 150 ++--- drivers/staging/gpib/fmh_gpib/fmh_gpib.c | 208 +++---- drivers/staging/gpib/gpio/gpib_bitbang.c | 50 +- drivers/staging/gpib/hp_82335/hp82335.c | 52 +- drivers/staging/gpib/hp_82335/hp82335.h | 3 - drivers/staging/gpib/hp_82341/hp_82341.c | 102 ++-- drivers/staging/gpib/hp_82341/hp_82341.h | 2 - drivers/staging/gpib/ines/ines.h | 7 - drivers/staging/gpib/ines/ines_gpib.c | 364 ++++++------ .../gpib/lpvo_usb_gpib/lpvo_usb_gpib.c | 54 +- drivers/staging/gpib/ni_usb/ni_usb_gpib.c | 54 +- drivers/staging/gpib/pc2/pc2_gpib.c | 208 +++---- drivers/staging/gpib/tnt4882/tnt4882_gpib.c | 520 +++++++++--------- 20 files changed, 1217 insertions(+), 1240 deletions(-) diff --git a/drivers/staging/gpib/agilent_82350b/agilent_82350b.c b/drivers= /staging/gpib/agilent_82350b/agilent_82350b.c index e9c1f0100b2a..95bb55b4c0e9 100644 --- a/drivers/staging/gpib/agilent_82350b/agilent_82350b.c +++ b/drivers/staging/gpib/agilent_82350b/agilent_82350b.c @@ -828,58 +828,58 @@ void agilent_82350b_detach(gpib_board_t *board) agilent_82350b_free_private(board); } =20 -gpib_interface_t agilent_82350b_unaccel_interface =3D { -name: "agilent_82350b_unaccel", -attach : agilent_82350b_unaccel_attach, -detach : agilent_82350b_detach, -read : agilent_82350b_read, -write : agilent_82350b_write, -command : agilent_82350b_command, -request_system_control : agilent_82350b_request_system_control, -take_control : agilent_82350b_take_control, -go_to_standby : agilent_82350b_go_to_standby, -interface_clear : agilent_82350b_interface_clear, -remote_enable : agilent_82350b_remote_enable, -enable_eos : agilent_82350b_enable_eos, -disable_eos : agilent_82350b_disable_eos, -parallel_poll : agilent_82350b_parallel_poll, -parallel_poll_configure : agilent_82350b_parallel_poll_configure, -parallel_poll_response : agilent_82350b_parallel_poll_response, -local_parallel_poll_mode : NULL, // XXX -line_status : agilent_82350b_line_status, -update_status : agilent_82350b_update_status, -primary_address : agilent_82350b_primary_address, -secondary_address : agilent_82350b_secondary_address, -serial_poll_response : agilent_82350b_serial_poll_response, -t1_delay : agilent_82350b_t1_delay, -return_to_local : agilent_82350b_return_to_local, +static gpib_interface_t agilent_82350b_unaccel_interface =3D { + .name =3D "agilent_82350b_unaccel", + .attach =3D agilent_82350b_unaccel_attach, + .detach =3D agilent_82350b_detach, + .read =3D agilent_82350b_read, + .write =3D agilent_82350b_write, + .command =3D agilent_82350b_command, + .request_system_control =3D agilent_82350b_request_system_control, + .take_control =3D agilent_82350b_take_control, + .go_to_standby =3D agilent_82350b_go_to_standby, + .interface_clear =3D agilent_82350b_interface_clear, + .remote_enable =3D agilent_82350b_remote_enable, + .enable_eos =3D agilent_82350b_enable_eos, + .disable_eos =3D agilent_82350b_disable_eos, + .parallel_poll =3D agilent_82350b_parallel_poll, + .parallel_poll_configure =3D agilent_82350b_parallel_poll_configure, + .parallel_poll_response =3D agilent_82350b_parallel_poll_response, + .local_parallel_poll_mode =3D NULL, // XXX + .line_status =3D agilent_82350b_line_status, + .update_status =3D agilent_82350b_update_status, + .primary_address =3D agilent_82350b_primary_address, + .secondary_address =3D agilent_82350b_secondary_address, + .serial_poll_response =3D agilent_82350b_serial_poll_response, + .t1_delay =3D agilent_82350b_t1_delay, + .return_to_local =3D agilent_82350b_return_to_local, }; =20 -gpib_interface_t agilent_82350b_interface =3D { -name: "agilent_82350b", -attach : agilent_82350b_accel_attach, -detach : agilent_82350b_detach, -read : agilent_82350b_accel_read, -write : agilent_82350b_accel_write, -command : agilent_82350b_command, -request_system_control : agilent_82350b_request_system_control, -take_control : agilent_82350b_take_control, -go_to_standby : agilent_82350b_go_to_standby, -interface_clear : agilent_82350b_interface_clear, -remote_enable : agilent_82350b_remote_enable, -enable_eos : agilent_82350b_enable_eos, -disable_eos : agilent_82350b_disable_eos, -parallel_poll : agilent_82350b_parallel_poll, -parallel_poll_configure : agilent_82350b_parallel_poll_configure, -parallel_poll_response : agilent_82350b_parallel_poll_response, -local_parallel_poll_mode : NULL, // XXX -line_status : agilent_82350b_line_status, -update_status : agilent_82350b_update_status, -primary_address : agilent_82350b_primary_address, -secondary_address : agilent_82350b_secondary_address, -serial_poll_response : agilent_82350b_serial_poll_response, -t1_delay : agilent_82350b_t1_delay, -return_to_local : agilent_82350b_return_to_local, +static gpib_interface_t agilent_82350b_interface =3D { + .name =3D "agilent_82350b", + .attach =3D agilent_82350b_accel_attach, + .detach =3D agilent_82350b_detach, + .read =3D agilent_82350b_accel_read, + .write =3D agilent_82350b_accel_write, + .command =3D agilent_82350b_command, + .request_system_control =3D agilent_82350b_request_system_control, + .take_control =3D agilent_82350b_take_control, + .go_to_standby =3D agilent_82350b_go_to_standby, + .interface_clear =3D agilent_82350b_interface_clear, + .remote_enable =3D agilent_82350b_remote_enable, + .enable_eos =3D agilent_82350b_enable_eos, + .disable_eos =3D agilent_82350b_disable_eos, + .parallel_poll =3D agilent_82350b_parallel_poll, + .parallel_poll_configure =3D agilent_82350b_parallel_poll_configure, + .parallel_poll_response =3D agilent_82350b_parallel_poll_response, + .local_parallel_poll_mode =3D NULL, // XXX + .line_status =3D agilent_82350b_line_status, + .update_status =3D agilent_82350b_update_status, + .primary_address =3D agilent_82350b_primary_address, + .secondary_address =3D agilent_82350b_secondary_address, + .serial_poll_response =3D agilent_82350b_serial_poll_response, + .t1_delay =3D agilent_82350b_t1_delay, + .return_to_local =3D agilent_82350b_return_to_local, }; =20 static int agilent_82350b_pci_probe(struct pci_dev *dev, const struct pci_= device_id *id) diff --git a/drivers/staging/gpib/agilent_82350b/agilent_82350b.h b/drivers= /staging/gpib/agilent_82350b/agilent_82350b.h index 30683d67d170..6915c1b2c85b 100644 --- a/drivers/staging/gpib/agilent_82350b/agilent_82350b.h +++ b/drivers/staging/gpib/agilent_82350b/agilent_82350b.h @@ -60,8 +60,6 @@ struct agilent_82350b_priv { // driver name extern const char *driver_name; =20 -// interfaces -extern gpib_interface_t agilent_82350b_interface; // init functions =20 int agilent_82350b_unaccel_attach(gpib_board_t *board, const gpib_board_co= nfig_t *config); diff --git a/drivers/staging/gpib/agilent_82357a/agilent_82357a.c b/drivers= /staging/gpib/agilent_82357a/agilent_82357a.c index 261fb6d2e991..b21eadabc466 100644 --- a/drivers/staging/gpib/agilent_82357a/agilent_82357a.c +++ b/drivers/staging/gpib/agilent_82357a/agilent_82357a.c @@ -1462,34 +1462,34 @@ static void agilent_82357a_detach(gpib_board_t *boa= rd) mutex_unlock(&agilent_82357a_hotplug_lock); } =20 -gpib_interface_t agilent_82357a_gpib_interface =3D { -name: "agilent_82357a", -attach : agilent_82357a_attach, -detach : agilent_82357a_detach, -read : agilent_82357a_read, -write : agilent_82357a_write, -command : agilent_82357a_command, -take_control : agilent_82357a_take_control, -go_to_standby : agilent_82357a_go_to_standby, -request_system_control : agilent_82357a_request_system_control, -interface_clear : agilent_82357a_interface_clear, -remote_enable : agilent_82357a_remote_enable, -enable_eos : agilent_82357a_enable_eos, -disable_eos : agilent_82357a_disable_eos, -parallel_poll : agilent_82357a_parallel_poll, -parallel_poll_configure : agilent_82357a_parallel_poll_configure, -parallel_poll_response : agilent_82357a_parallel_poll_response, -local_parallel_poll_mode : NULL, // XXX -line_status : agilent_82357a_line_status, -update_status : agilent_82357a_update_status, -primary_address : agilent_82357a_primary_address, -secondary_address : agilent_82357a_secondary_address, -serial_poll_response : agilent_82357a_serial_poll_response, -serial_poll_status : agilent_82357a_serial_poll_status, -t1_delay : agilent_82357a_t1_delay, -return_to_local : agilent_82357a_return_to_local, -no_7_bit_eos : 1, -skip_check_for_command_acceptors : 1 +static gpib_interface_t agilent_82357a_gpib_interface =3D { + .name =3D "agilent_82357a", + .attach =3D agilent_82357a_attach, + .detach =3D agilent_82357a_detach, + .read =3D agilent_82357a_read, + .write =3D agilent_82357a_write, + .command =3D agilent_82357a_command, + .take_control =3D agilent_82357a_take_control, + .go_to_standby =3D agilent_82357a_go_to_standby, + .request_system_control =3D agilent_82357a_request_system_control, + .interface_clear =3D agilent_82357a_interface_clear, + .remote_enable =3D agilent_82357a_remote_enable, + .enable_eos =3D agilent_82357a_enable_eos, + .disable_eos =3D agilent_82357a_disable_eos, + .parallel_poll =3D agilent_82357a_parallel_poll, + .parallel_poll_configure =3D agilent_82357a_parallel_poll_configure, + .parallel_poll_response =3D agilent_82357a_parallel_poll_response, + .local_parallel_poll_mode =3D NULL, // XXX + .line_status =3D agilent_82357a_line_status, + .update_status =3D agilent_82357a_update_status, + .primary_address =3D agilent_82357a_primary_address, + .secondary_address =3D agilent_82357a_secondary_address, + .serial_poll_response =3D agilent_82357a_serial_poll_response, + .serial_poll_status =3D agilent_82357a_serial_poll_status, + .t1_delay =3D agilent_82357a_t1_delay, + .return_to_local =3D agilent_82357a_return_to_local, + .no_7_bit_eos =3D 1, + .skip_check_for_command_acceptors =3D 1 }; =20 // Table with the USB-devices: just now only testing IDs diff --git a/drivers/staging/gpib/cb7210/cb7210.c b/drivers/staging/gpib/cb= 7210/cb7210.c index 45a54219ea6d..d41368407810 100644 --- a/drivers/staging/gpib/cb7210/cb7210.c +++ b/drivers/staging/gpib/cb7210/cb7210.c @@ -683,170 +683,170 @@ void cb7210_return_to_local(gpib_board_t *board) write_byte(nec_priv, AUX_RTL, AUXMR); } =20 -gpib_interface_t cb_pci_unaccel_interface =3D { -name: "cbi_pci_unaccel", -attach : cb_pci_attach, -detach : cb_pci_detach, -read : cb7210_read, -write : cb7210_write, -command : cb7210_command, -take_control : cb7210_take_control, -go_to_standby : cb7210_go_to_standby, -request_system_control : cb7210_request_system_control, -interface_clear : cb7210_interface_clear, -remote_enable : cb7210_remote_enable, -enable_eos : cb7210_enable_eos, -disable_eos : cb7210_disable_eos, -parallel_poll : cb7210_parallel_poll, -parallel_poll_configure : cb7210_parallel_poll_configure, -parallel_poll_response : cb7210_parallel_poll_response, -local_parallel_poll_mode : NULL, // XXX -line_status : cb7210_line_status, -update_status : cb7210_update_status, -primary_address : cb7210_primary_address, -secondary_address : cb7210_secondary_address, -serial_poll_response : cb7210_serial_poll_response, -serial_poll_status : cb7210_serial_poll_status, -t1_delay : cb7210_t1_delay, -return_to_local : cb7210_return_to_local, +static gpib_interface_t cb_pci_unaccel_interface =3D { + .name =3D "cbi_pci_unaccel", + .attach =3D cb_pci_attach, + .detach =3D cb_pci_detach, + .read =3D cb7210_read, + .write =3D cb7210_write, + .command =3D cb7210_command, + .take_control =3D cb7210_take_control, + .go_to_standby =3D cb7210_go_to_standby, + .request_system_control =3D cb7210_request_system_control, + .interface_clear =3D cb7210_interface_clear, + .remote_enable =3D cb7210_remote_enable, + .enable_eos =3D cb7210_enable_eos, + .disable_eos =3D cb7210_disable_eos, + .parallel_poll =3D cb7210_parallel_poll, + .parallel_poll_configure =3D cb7210_parallel_poll_configure, + .parallel_poll_response =3D cb7210_parallel_poll_response, + .local_parallel_poll_mode =3D NULL, // XXX + .line_status =3D cb7210_line_status, + .update_status =3D cb7210_update_status, + .primary_address =3D cb7210_primary_address, + .secondary_address =3D cb7210_secondary_address, + .serial_poll_response =3D cb7210_serial_poll_response, + .serial_poll_status =3D cb7210_serial_poll_status, + .t1_delay =3D cb7210_t1_delay, + .return_to_local =3D cb7210_return_to_local, }; =20 -gpib_interface_t cb_pci_accel_interface =3D { -name: "cbi_pci_accel", -attach : cb_pci_attach, -detach : cb_pci_detach, -read : cb7210_accel_read, -write : cb7210_accel_write, -command : cb7210_command, -take_control : cb7210_take_control, -go_to_standby : cb7210_go_to_standby, -request_system_control : cb7210_request_system_control, -interface_clear : cb7210_interface_clear, -remote_enable : cb7210_remote_enable, -enable_eos : cb7210_enable_eos, -disable_eos : cb7210_disable_eos, -parallel_poll : cb7210_parallel_poll, -parallel_poll_configure : cb7210_parallel_poll_configure, -parallel_poll_response : cb7210_parallel_poll_response, -local_parallel_poll_mode : NULL, // XXX -line_status : cb7210_line_status, -update_status : cb7210_update_status, -primary_address : cb7210_primary_address, -secondary_address : cb7210_secondary_address, -serial_poll_response : cb7210_serial_poll_response, -serial_poll_status : cb7210_serial_poll_status, -t1_delay : cb7210_t1_delay, -return_to_local : cb7210_return_to_local, +static gpib_interface_t cb_pci_accel_interface =3D { + .name =3D "cbi_pci_accel", + .attach =3D cb_pci_attach, + .detach =3D cb_pci_detach, + .read =3D cb7210_accel_read, + .write =3D cb7210_accel_write, + .command =3D cb7210_command, + .take_control =3D cb7210_take_control, + .go_to_standby =3D cb7210_go_to_standby, + .request_system_control =3D cb7210_request_system_control, + .interface_clear =3D cb7210_interface_clear, + .remote_enable =3D cb7210_remote_enable, + .enable_eos =3D cb7210_enable_eos, + .disable_eos =3D cb7210_disable_eos, + .parallel_poll =3D cb7210_parallel_poll, + .parallel_poll_configure =3D cb7210_parallel_poll_configure, + .parallel_poll_response =3D cb7210_parallel_poll_response, + .local_parallel_poll_mode =3D NULL, // XXX + .line_status =3D cb7210_line_status, + .update_status =3D cb7210_update_status, + .primary_address =3D cb7210_primary_address, + .secondary_address =3D cb7210_secondary_address, + .serial_poll_response =3D cb7210_serial_poll_response, + .serial_poll_status =3D cb7210_serial_poll_status, + .t1_delay =3D cb7210_t1_delay, + .return_to_local =3D cb7210_return_to_local, }; =20 -gpib_interface_t cb_pci_interface =3D { -name: "cbi_pci", -attach : cb_pci_attach, -detach : cb_pci_detach, -read : cb7210_accel_read, -write : cb7210_accel_write, -command : cb7210_command, -take_control : cb7210_take_control, -go_to_standby : cb7210_go_to_standby, -request_system_control : cb7210_request_system_control, -interface_clear : cb7210_interface_clear, -remote_enable : cb7210_remote_enable, -enable_eos : cb7210_enable_eos, -disable_eos : cb7210_disable_eos, -parallel_poll : cb7210_parallel_poll, -parallel_poll_configure : cb7210_parallel_poll_configure, -parallel_poll_response : cb7210_parallel_poll_response, -line_status : cb7210_line_status, -update_status : cb7210_update_status, -primary_address : cb7210_primary_address, -secondary_address : cb7210_secondary_address, -serial_poll_response : cb7210_serial_poll_response, -serial_poll_status : cb7210_serial_poll_status, -t1_delay : cb7210_t1_delay, -return_to_local : cb7210_return_to_local, +static gpib_interface_t cb_pci_interface =3D { + .name =3D "cbi_pci", + .attach =3D cb_pci_attach, + .detach =3D cb_pci_detach, + .read =3D cb7210_accel_read, + .write =3D cb7210_accel_write, + .command =3D cb7210_command, + .take_control =3D cb7210_take_control, + .go_to_standby =3D cb7210_go_to_standby, + .request_system_control =3D cb7210_request_system_control, + .interface_clear =3D cb7210_interface_clear, + .remote_enable =3D cb7210_remote_enable, + .enable_eos =3D cb7210_enable_eos, + .disable_eos =3D cb7210_disable_eos, + .parallel_poll =3D cb7210_parallel_poll, + .parallel_poll_configure =3D cb7210_parallel_poll_configure, + .parallel_poll_response =3D cb7210_parallel_poll_response, + .line_status =3D cb7210_line_status, + .update_status =3D cb7210_update_status, + .primary_address =3D cb7210_primary_address, + .secondary_address =3D cb7210_secondary_address, + .serial_poll_response =3D cb7210_serial_poll_response, + .serial_poll_status =3D cb7210_serial_poll_status, + .t1_delay =3D cb7210_t1_delay, + .return_to_local =3D cb7210_return_to_local, }; =20 -gpib_interface_t cb_isa_unaccel_interface =3D { -name: "cbi_isa_unaccel", -attach : cb_isa_attach, -detach : cb_isa_detach, -read : cb7210_read, -write : cb7210_write, -command : cb7210_command, -take_control : cb7210_take_control, -go_to_standby : cb7210_go_to_standby, -request_system_control : cb7210_request_system_control, -interface_clear : cb7210_interface_clear, -remote_enable : cb7210_remote_enable, -enable_eos : cb7210_enable_eos, -disable_eos : cb7210_disable_eos, -parallel_poll : cb7210_parallel_poll, -parallel_poll_configure : cb7210_parallel_poll_configure, -parallel_poll_response : cb7210_parallel_poll_response, -local_parallel_poll_mode : NULL, // XXX -line_status : cb7210_line_status, -update_status : cb7210_update_status, -primary_address : cb7210_primary_address, -secondary_address : cb7210_secondary_address, -serial_poll_response : cb7210_serial_poll_response, -serial_poll_status : cb7210_serial_poll_status, -t1_delay : cb7210_t1_delay, -return_to_local : cb7210_return_to_local, +static gpib_interface_t cb_isa_unaccel_interface =3D { + .name =3D "cbi_isa_unaccel", + .attach =3D cb_isa_attach, + .detach =3D cb_isa_detach, + .read =3D cb7210_read, + .write =3D cb7210_write, + .command =3D cb7210_command, + .take_control =3D cb7210_take_control, + .go_to_standby =3D cb7210_go_to_standby, + .request_system_control =3D cb7210_request_system_control, + .interface_clear =3D cb7210_interface_clear, + .remote_enable =3D cb7210_remote_enable, + .enable_eos =3D cb7210_enable_eos, + .disable_eos =3D cb7210_disable_eos, + .parallel_poll =3D cb7210_parallel_poll, + .parallel_poll_configure =3D cb7210_parallel_poll_configure, + .parallel_poll_response =3D cb7210_parallel_poll_response, + .local_parallel_poll_mode =3D NULL, // XXX + .line_status =3D cb7210_line_status, + .update_status =3D cb7210_update_status, + .primary_address =3D cb7210_primary_address, + .secondary_address =3D cb7210_secondary_address, + .serial_poll_response =3D cb7210_serial_poll_response, + .serial_poll_status =3D cb7210_serial_poll_status, + .t1_delay =3D cb7210_t1_delay, + .return_to_local =3D cb7210_return_to_local, }; =20 -gpib_interface_t cb_isa_interface =3D { -name: "cbi_isa", -attach : cb_isa_attach, -detach : cb_isa_detach, -read : cb7210_accel_read, -write : cb7210_accel_write, -command : cb7210_command, -take_control : cb7210_take_control, -go_to_standby : cb7210_go_to_standby, -request_system_control : cb7210_request_system_control, -interface_clear : cb7210_interface_clear, -remote_enable : cb7210_remote_enable, -enable_eos : cb7210_enable_eos, -disable_eos : cb7210_disable_eos, -parallel_poll : cb7210_parallel_poll, -parallel_poll_configure : cb7210_parallel_poll_configure, -parallel_poll_response : cb7210_parallel_poll_response, -line_status : cb7210_line_status, -update_status : cb7210_update_status, -primary_address : cb7210_primary_address, -secondary_address : cb7210_secondary_address, -serial_poll_response : cb7210_serial_poll_response, -serial_poll_status : cb7210_serial_poll_status, -t1_delay : cb7210_t1_delay, -return_to_local : cb7210_return_to_local, +static gpib_interface_t cb_isa_interface =3D { + .name =3D "cbi_isa", + .attach =3D cb_isa_attach, + .detach =3D cb_isa_detach, + .read =3D cb7210_accel_read, + .write =3D cb7210_accel_write, + .command =3D cb7210_command, + .take_control =3D cb7210_take_control, + .go_to_standby =3D cb7210_go_to_standby, + .request_system_control =3D cb7210_request_system_control, + .interface_clear =3D cb7210_interface_clear, + .remote_enable =3D cb7210_remote_enable, + .enable_eos =3D cb7210_enable_eos, + .disable_eos =3D cb7210_disable_eos, + .parallel_poll =3D cb7210_parallel_poll, + .parallel_poll_configure =3D cb7210_parallel_poll_configure, + .parallel_poll_response =3D cb7210_parallel_poll_response, + .line_status =3D cb7210_line_status, + .update_status =3D cb7210_update_status, + .primary_address =3D cb7210_primary_address, + .secondary_address =3D cb7210_secondary_address, + .serial_poll_response =3D cb7210_serial_poll_response, + .serial_poll_status =3D cb7210_serial_poll_status, + .t1_delay =3D cb7210_t1_delay, + .return_to_local =3D cb7210_return_to_local, }; =20 -gpib_interface_t cb_isa_accel_interface =3D { -name: "cbi_isa_accel", -attach : cb_isa_attach, -detach : cb_isa_detach, -read : cb7210_accel_read, -write : cb7210_accel_write, -command : cb7210_command, -take_control : cb7210_take_control, -go_to_standby : cb7210_go_to_standby, -request_system_control : cb7210_request_system_control, -interface_clear : cb7210_interface_clear, -remote_enable : cb7210_remote_enable, -enable_eos : cb7210_enable_eos, -disable_eos : cb7210_disable_eos, -parallel_poll : cb7210_parallel_poll, -parallel_poll_configure : cb7210_parallel_poll_configure, -parallel_poll_response : cb7210_parallel_poll_response, -local_parallel_poll_mode : NULL, // XXX -line_status : cb7210_line_status, -update_status : cb7210_update_status, -primary_address : cb7210_primary_address, -secondary_address : cb7210_secondary_address, -serial_poll_response : cb7210_serial_poll_response, -serial_poll_status : cb7210_serial_poll_status, -t1_delay : cb7210_t1_delay, -return_to_local : cb7210_return_to_local, +static gpib_interface_t cb_isa_accel_interface =3D { + .name =3D "cbi_isa_accel", + .attach =3D cb_isa_attach, + .detach =3D cb_isa_detach, + .read =3D cb7210_accel_read, + .write =3D cb7210_accel_write, + .command =3D cb7210_command, + .take_control =3D cb7210_take_control, + .go_to_standby =3D cb7210_go_to_standby, + .request_system_control =3D cb7210_request_system_control, + .interface_clear =3D cb7210_interface_clear, + .remote_enable =3D cb7210_remote_enable, + .enable_eos =3D cb7210_enable_eos, + .disable_eos =3D cb7210_disable_eos, + .parallel_poll =3D cb7210_parallel_poll, + .parallel_poll_configure =3D cb7210_parallel_poll_configure, + .parallel_poll_response =3D cb7210_parallel_poll_response, + .local_parallel_poll_mode =3D NULL, // XXX + .line_status =3D cb7210_line_status, + .update_status =3D cb7210_update_status, + .primary_address =3D cb7210_primary_address, + .secondary_address =3D cb7210_secondary_address, + .serial_poll_response =3D cb7210_serial_poll_response, + .serial_poll_status =3D cb7210_serial_poll_status, + .t1_delay =3D cb7210_t1_delay, + .return_to_local =3D cb7210_return_to_local, }; =20 static int cb7210_allocate_private(gpib_board_t *board) @@ -1357,88 +1357,88 @@ void cb_pcmcia_cleanup_module(void) pcmcia_unregister_driver(&cb_gpib_cs_driver); } =20 -gpib_interface_t cb_pcmcia_unaccel_interface =3D { -name: "cbi_pcmcia_unaccel", -attach : cb_pcmcia_attach, -detach : cb_pcmcia_detach, -read : cb7210_read, -write : cb7210_write, -command : cb7210_command, -take_control : cb7210_take_control, -go_to_standby : cb7210_go_to_standby, -request_system_control : cb7210_request_system_control, -interface_clear : cb7210_interface_clear, -remote_enable : cb7210_remote_enable, -enable_eos : cb7210_enable_eos, -disable_eos : cb7210_disable_eos, -parallel_poll : cb7210_parallel_poll, -parallel_poll_configure : cb7210_parallel_poll_configure, -parallel_poll_response : cb7210_parallel_poll_response, -local_parallel_poll_mode : NULL, // XXX -line_status : cb7210_line_status, -update_status : cb7210_update_status, -primary_address : cb7210_primary_address, -secondary_address : cb7210_secondary_address, -serial_poll_response : cb7210_serial_poll_response, -serial_poll_status : cb7210_serial_poll_status, -t1_delay : cb7210_t1_delay, -return_to_local : cb7210_return_to_local, +static gpib_interface_t cb_pcmcia_unaccel_interface =3D { + .name =3D "cbi_pcmcia_unaccel", + .attach =3D cb_pcmcia_attach, + .detach =3D cb_pcmcia_detach, + .read =3D cb7210_read, + .write =3D cb7210_write, + .command =3D cb7210_command, + .take_control =3D cb7210_take_control, + .go_to_standby =3D cb7210_go_to_standby, + .request_system_control =3D cb7210_request_system_control, + .interface_clear =3D cb7210_interface_clear, + .remote_enable =3D cb7210_remote_enable, + .enable_eos =3D cb7210_enable_eos, + .disable_eos =3D cb7210_disable_eos, + .parallel_poll =3D cb7210_parallel_poll, + .parallel_poll_configure =3D cb7210_parallel_poll_configure, + .parallel_poll_response =3D cb7210_parallel_poll_response, + .local_parallel_poll_mode =3D NULL, // XXX + .line_status =3D cb7210_line_status, + .update_status =3D cb7210_update_status, + .primary_address =3D cb7210_primary_address, + .secondary_address =3D cb7210_secondary_address, + .serial_poll_response =3D cb7210_serial_poll_response, + .serial_poll_status =3D cb7210_serial_poll_status, + .t1_delay =3D cb7210_t1_delay, + .return_to_local =3D cb7210_return_to_local, }; =20 -gpib_interface_t cb_pcmcia_interface =3D { -name: "cbi_pcmcia", -attach : cb_pcmcia_attach, -detach : cb_pcmcia_detach, -read : cb7210_accel_read, -write : cb7210_accel_write, -command : cb7210_command, -take_control : cb7210_take_control, -go_to_standby : cb7210_go_to_standby, -request_system_control : cb7210_request_system_control, -interface_clear : cb7210_interface_clear, -remote_enable : cb7210_remote_enable, -enable_eos : cb7210_enable_eos, -disable_eos : cb7210_disable_eos, -parallel_poll : cb7210_parallel_poll, -parallel_poll_configure : cb7210_parallel_poll_configure, -parallel_poll_response : cb7210_parallel_poll_response, -local_parallel_poll_mode : NULL, // XXX -line_status : cb7210_line_status, -update_status : cb7210_update_status, -primary_address : cb7210_primary_address, -secondary_address : cb7210_secondary_address, -serial_poll_response : cb7210_serial_poll_response, -serial_poll_status : cb7210_serial_poll_status, -t1_delay : cb7210_t1_delay, -return_to_local : cb7210_return_to_local, +static gpib_interface_t cb_pcmcia_interface =3D { + .name =3D "cbi_pcmcia", + .attach =3D cb_pcmcia_attach, + .detach =3D cb_pcmcia_detach, + .read =3D cb7210_accel_read, + .write =3D cb7210_accel_write, + .command =3D cb7210_command, + .take_control =3D cb7210_take_control, + .go_to_standby =3D cb7210_go_to_standby, + .request_system_control =3D cb7210_request_system_control, + .interface_clear =3D cb7210_interface_clear, + .remote_enable =3D cb7210_remote_enable, + .enable_eos =3D cb7210_enable_eos, + .disable_eos =3D cb7210_disable_eos, + .parallel_poll =3D cb7210_parallel_poll, + .parallel_poll_configure =3D cb7210_parallel_poll_configure, + .parallel_poll_response =3D cb7210_parallel_poll_response, + .local_parallel_poll_mode =3D NULL, // XXX + .line_status =3D cb7210_line_status, + .update_status =3D cb7210_update_status, + .primary_address =3D cb7210_primary_address, + .secondary_address =3D cb7210_secondary_address, + .serial_poll_response =3D cb7210_serial_poll_response, + .serial_poll_status =3D cb7210_serial_poll_status, + .t1_delay =3D cb7210_t1_delay, + .return_to_local =3D cb7210_return_to_local, }; =20 -gpib_interface_t cb_pcmcia_accel_interface =3D { -name: "cbi_pcmcia_accel", -attach : cb_pcmcia_attach, -detach : cb_pcmcia_detach, -read : cb7210_accel_read, -write : cb7210_accel_write, -command : cb7210_command, -take_control : cb7210_take_control, -go_to_standby : cb7210_go_to_standby, -request_system_control : cb7210_request_system_control, -interface_clear : cb7210_interface_clear, -remote_enable : cb7210_remote_enable, -enable_eos : cb7210_enable_eos, -disable_eos : cb7210_disable_eos, -parallel_poll : cb7210_parallel_poll, -parallel_poll_configure : cb7210_parallel_poll_configure, -parallel_poll_response : cb7210_parallel_poll_response, -local_parallel_poll_mode : NULL, // XXX -line_status : cb7210_line_status, -update_status : cb7210_update_status, -primary_address : cb7210_primary_address, -secondary_address : cb7210_secondary_address, -serial_poll_response : cb7210_serial_poll_response, -serial_poll_status : cb7210_serial_poll_status, -t1_delay : cb7210_t1_delay, -return_to_local : cb7210_return_to_local, +static gpib_interface_t cb_pcmcia_accel_interface =3D { + .name =3D "cbi_pcmcia_accel", + .attach =3D cb_pcmcia_attach, + .detach =3D cb_pcmcia_detach, + .read =3D cb7210_accel_read, + .write =3D cb7210_accel_write, + .command =3D cb7210_command, + .take_control =3D cb7210_take_control, + .go_to_standby =3D cb7210_go_to_standby, + .request_system_control =3D cb7210_request_system_control, + .interface_clear =3D cb7210_interface_clear, + .remote_enable =3D cb7210_remote_enable, + .enable_eos =3D cb7210_enable_eos, + .disable_eos =3D cb7210_disable_eos, + .parallel_poll =3D cb7210_parallel_poll, + .parallel_poll_configure =3D cb7210_parallel_poll_configure, + .parallel_poll_response =3D cb7210_parallel_poll_response, + .local_parallel_poll_mode =3D NULL, // XXX + .line_status =3D cb7210_line_status, + .update_status =3D cb7210_update_status, + .primary_address =3D cb7210_primary_address, + .secondary_address =3D cb7210_secondary_address, + .serial_poll_response =3D cb7210_serial_poll_response, + .serial_poll_status =3D cb7210_serial_poll_status, + .t1_delay =3D cb7210_t1_delay, + .return_to_local =3D cb7210_return_to_local, }; =20 int cb_pcmcia_attach(gpib_board_t *board, const gpib_board_config_t *confi= g) diff --git a/drivers/staging/gpib/cb7210/cb7210.h b/drivers/staging/gpib/cb= 7210/cb7210.h index 4ad976de2b68..18353b542f9f 100644 --- a/drivers/staging/gpib/cb7210/cb7210.h +++ b/drivers/staging/gpib/cb7210/cb7210.h @@ -36,11 +36,6 @@ struct cb7210_priv { unsigned in_fifo_half_full : 1; }; =20 -// interfaces -extern gpib_interface_t cb_pcmcia_interface; -extern gpib_interface_t cb_pcmcia_accel_interface; -extern gpib_interface_t cb_pcmcia_unaccel_interface; - // interrupt service routines irqreturn_t cb_pci_interrupt(int irq, void *arg); irqreturn_t cb7210_interrupt(int irq, void *arg); diff --git a/drivers/staging/gpib/cec/cec.h b/drivers/staging/gpib/cec/cec.h index 352cf83d8328..040ca70ed708 100644 --- a/drivers/staging/gpib/cec/cec.h +++ b/drivers/staging/gpib/cec/cec.h @@ -16,10 +16,6 @@ struct cec_priv { unsigned int irq; }; =20 -// interfaces -extern gpib_interface_t cec_pci_interface; -extern gpib_interface_t cec_pcmcia_interface; - // interface functions int cec_read(gpib_board_t *board, uint8_t *buffer, size_t length, int *end= , size_t *bytes_read); int cec_write(gpib_board_t *board, uint8_t *buffer, size_t length, int sen= d_eoi, diff --git a/drivers/staging/gpib/cec/cec_gpib.c b/drivers/staging/gpib/cec= /cec_gpib.c index e5b0941872f5..a72d79b9d7a4 100644 --- a/drivers/staging/gpib/cec/cec_gpib.c +++ b/drivers/staging/gpib/cec/cec_gpib.c @@ -182,32 +182,32 @@ void cec_return_to_local(gpib_board_t *board) nec7210_return_to_local(board, &priv->nec7210_priv); } =20 -gpib_interface_t cec_pci_interface =3D { -name: "cec_pci", -attach : cec_pci_attach, -detach : cec_pci_detach, -read : cec_read, -write : cec_write, -command : cec_command, -take_control : cec_take_control, -go_to_standby : cec_go_to_standby, -request_system_control : cec_request_system_control, -interface_clear : cec_interface_clear, -remote_enable : cec_remote_enable, -enable_eos : cec_enable_eos, -disable_eos : cec_disable_eos, -parallel_poll : cec_parallel_poll, -parallel_poll_configure : cec_parallel_poll_configure, -parallel_poll_response : cec_parallel_poll_response, -local_parallel_poll_mode : NULL, // XXX -line_status : NULL, //XXX -update_status : cec_update_status, -primary_address : cec_primary_address, -secondary_address : cec_secondary_address, -serial_poll_response : cec_serial_poll_response, -serial_poll_status : cec_serial_poll_status, -t1_delay : cec_t1_delay, -return_to_local : cec_return_to_local, +static gpib_interface_t cec_pci_interface =3D { + .name =3D "cec_pci", + .attach =3D cec_pci_attach, + .detach =3D cec_pci_detach, + .read =3D cec_read, + .write =3D cec_write, + .command =3D cec_command, + .take_control =3D cec_take_control, + .go_to_standby =3D cec_go_to_standby, + .request_system_control =3D cec_request_system_control, + .interface_clear =3D cec_interface_clear, + .remote_enable =3D cec_remote_enable, + .enable_eos =3D cec_enable_eos, + .disable_eos =3D cec_disable_eos, + .parallel_poll =3D cec_parallel_poll, + .parallel_poll_configure =3D cec_parallel_poll_configure, + .parallel_poll_response =3D cec_parallel_poll_response, + .local_parallel_poll_mode =3D NULL, // XXX + .line_status =3D NULL, //XXX + .update_status =3D cec_update_status, + .primary_address =3D cec_primary_address, + .secondary_address =3D cec_secondary_address, + .serial_poll_response =3D cec_serial_poll_response, + .serial_poll_status =3D cec_serial_poll_status, + .t1_delay =3D cec_t1_delay, + .return_to_local =3D cec_return_to_local, }; =20 static int cec_allocate_private(gpib_board_t *board) diff --git a/drivers/staging/gpib/eastwood/fluke_gpib.c b/drivers/staging/g= pib/eastwood/fluke_gpib.c index 875b3adcb584..df4855acac4a 100644 --- a/drivers/staging/gpib/eastwood/fluke_gpib.c +++ b/drivers/staging/gpib/eastwood/fluke_gpib.c @@ -720,31 +720,31 @@ static int fluke_accel_read(gpib_board_t *board, uint= 8_t *buffer, size_t length, return retval; } =20 -gpib_interface_t fluke_unaccel_interface =3D { -name: "fluke_unaccel", -attach : fluke_attach_holdoff_all, -detach : fluke_detach, -read : fluke_read, -write : fluke_write, -command : fluke_command, -take_control : fluke_take_control, -go_to_standby : fluke_go_to_standby, -request_system_control : fluke_request_system_control, -interface_clear : fluke_interface_clear, -remote_enable : fluke_remote_enable, -enable_eos : fluke_enable_eos, -disable_eos : fluke_disable_eos, -parallel_poll : fluke_parallel_poll, -parallel_poll_configure : fluke_parallel_poll_configure, -parallel_poll_response : fluke_parallel_poll_response, -line_status : fluke_line_status, -update_status : fluke_update_status, -primary_address : fluke_primary_address, -secondary_address : fluke_secondary_address, -serial_poll_response : fluke_serial_poll_response, -serial_poll_status : fluke_serial_poll_status, -t1_delay : fluke_t1_delay, -return_to_local : fluke_return_to_local, +static gpib_interface_t fluke_unaccel_interface =3D { + .name =3D "fluke_unaccel", + .attach =3D fluke_attach_holdoff_all, + .detach =3D fluke_detach, + .read =3D fluke_read, + .write =3D fluke_write, + .command =3D fluke_command, + .take_control =3D fluke_take_control, + .go_to_standby =3D fluke_go_to_standby, + .request_system_control =3D fluke_request_system_control, + .interface_clear =3D fluke_interface_clear, + .remote_enable =3D fluke_remote_enable, + .enable_eos =3D fluke_enable_eos, + .disable_eos =3D fluke_disable_eos, + .parallel_poll =3D fluke_parallel_poll, + .parallel_poll_configure =3D fluke_parallel_poll_configure, + .parallel_poll_response =3D fluke_parallel_poll_response, + .line_status =3D fluke_line_status, + .update_status =3D fluke_update_status, + .primary_address =3D fluke_primary_address, + .secondary_address =3D fluke_secondary_address, + .serial_poll_response =3D fluke_serial_poll_response, + .serial_poll_status =3D fluke_serial_poll_status, + .t1_delay =3D fluke_t1_delay, + .return_to_local =3D fluke_return_to_local, }; =20 /* fluke_hybrid uses dma for writes but not for reads. Added @@ -755,58 +755,58 @@ return_to_local : fluke_return_to_local, * register just as the dma controller is also doing a read. */ =20 -gpib_interface_t fluke_hybrid_interface =3D { -name: "fluke_hybrid", -attach : fluke_attach_holdoff_all, -detach : fluke_detach, -read : fluke_read, -write : fluke_accel_write, -command : fluke_command, -take_control : fluke_take_control, -go_to_standby : fluke_go_to_standby, -request_system_control : fluke_request_system_control, -interface_clear : fluke_interface_clear, -remote_enable : fluke_remote_enable, -enable_eos : fluke_enable_eos, -disable_eos : fluke_disable_eos, -parallel_poll : fluke_parallel_poll, -parallel_poll_configure : fluke_parallel_poll_configure, -parallel_poll_response : fluke_parallel_poll_response, -line_status : fluke_line_status, -update_status : fluke_update_status, -primary_address : fluke_primary_address, -secondary_address : fluke_secondary_address, -serial_poll_response : fluke_serial_poll_response, -serial_poll_status : fluke_serial_poll_status, -t1_delay : fluke_t1_delay, -return_to_local : fluke_return_to_local, +static gpib_interface_t fluke_hybrid_interface =3D { + .name =3D "fluke_hybrid", + .attach =3D fluke_attach_holdoff_all, + .detach =3D fluke_detach, + .read =3D fluke_read, + .write =3D fluke_accel_write, + .command =3D fluke_command, + .take_control =3D fluke_take_control, + .go_to_standby =3D fluke_go_to_standby, + .request_system_control =3D fluke_request_system_control, + .interface_clear =3D fluke_interface_clear, + .remote_enable =3D fluke_remote_enable, + .enable_eos =3D fluke_enable_eos, + .disable_eos =3D fluke_disable_eos, + .parallel_poll =3D fluke_parallel_poll, + .parallel_poll_configure =3D fluke_parallel_poll_configure, + .parallel_poll_response =3D fluke_parallel_poll_response, + .line_status =3D fluke_line_status, + .update_status =3D fluke_update_status, + .primary_address =3D fluke_primary_address, + .secondary_address =3D fluke_secondary_address, + .serial_poll_response =3D fluke_serial_poll_response, + .serial_poll_status =3D fluke_serial_poll_status, + .t1_delay =3D fluke_t1_delay, + .return_to_local =3D fluke_return_to_local, }; =20 -gpib_interface_t fluke_interface =3D { -name: "fluke", -attach : fluke_attach_holdoff_end, -detach : fluke_detach, -read : fluke_accel_read, -write : fluke_accel_write, -command : fluke_command, -take_control : fluke_take_control, -go_to_standby : fluke_go_to_standby, -request_system_control : fluke_request_system_control, -interface_clear : fluke_interface_clear, -remote_enable : fluke_remote_enable, -enable_eos : fluke_enable_eos, -disable_eos : fluke_disable_eos, -parallel_poll : fluke_parallel_poll, -parallel_poll_configure : fluke_parallel_poll_configure, -parallel_poll_response : fluke_parallel_poll_response, -line_status : fluke_line_status, -update_status : fluke_update_status, -primary_address : fluke_primary_address, -secondary_address : fluke_secondary_address, -serial_poll_response : fluke_serial_poll_response, -serial_poll_status : fluke_serial_poll_status, -t1_delay : fluke_t1_delay, -return_to_local : fluke_return_to_local, +static gpib_interface_t fluke_interface =3D { + .name =3D "fluke", + .attach =3D fluke_attach_holdoff_end, + .detach =3D fluke_detach, + .read =3D fluke_accel_read, + .write =3D fluke_accel_write, + .command =3D fluke_command, + .take_control =3D fluke_take_control, + .go_to_standby =3D fluke_go_to_standby, + .request_system_control =3D fluke_request_system_control, + .interface_clear =3D fluke_interface_clear, + .remote_enable =3D fluke_remote_enable, + .enable_eos =3D fluke_enable_eos, + .disable_eos =3D fluke_disable_eos, + .parallel_poll =3D fluke_parallel_poll, + .parallel_poll_configure =3D fluke_parallel_poll_configure, + .parallel_poll_response =3D fluke_parallel_poll_response, + .line_status =3D fluke_line_status, + .update_status =3D fluke_update_status, + .primary_address =3D fluke_primary_address, + .secondary_address =3D fluke_secondary_address, + .serial_poll_response =3D fluke_serial_poll_response, + .serial_poll_status =3D fluke_serial_poll_status, + .t1_delay =3D fluke_t1_delay, + .return_to_local =3D fluke_return_to_local, }; =20 irqreturn_t fluke_gpib_internal_interrupt(gpib_board_t *board) diff --git a/drivers/staging/gpib/fmh_gpib/fmh_gpib.c b/drivers/staging/gpi= b/fmh_gpib/fmh_gpib.c index 90108ce0304a..fcef6e1aa618 100644 --- a/drivers/staging/gpib/fmh_gpib/fmh_gpib.c +++ b/drivers/staging/gpib/fmh_gpib/fmh_gpib.c @@ -1038,116 +1038,116 @@ static int fmh_gpib_fifo_read(gpib_board_t *board= , uint8_t *buffer, size_t lengt return retval; } =20 -gpib_interface_t fmh_gpib_unaccel_interface =3D { -name: "fmh_gpib_unaccel", -attach : fmh_gpib_attach_holdoff_all, -detach : fmh_gpib_detach, -read : fmh_gpib_read, -write : fmh_gpib_write, -command : fmh_gpib_command, -take_control : fmh_gpib_take_control, -go_to_standby : fmh_gpib_go_to_standby, -request_system_control : fmh_gpib_request_system_control, -interface_clear : fmh_gpib_interface_clear, -remote_enable : fmh_gpib_remote_enable, -enable_eos : fmh_gpib_enable_eos, -disable_eos : fmh_gpib_disable_eos, -parallel_poll : fmh_gpib_parallel_poll, -parallel_poll_configure : fmh_gpib_parallel_poll_configure, -parallel_poll_response : fmh_gpib_parallel_poll_response, -local_parallel_poll_mode : fmh_gpib_local_parallel_poll_mode, -line_status : fmh_gpib_line_status, -update_status : fmh_gpib_update_status, -primary_address : fmh_gpib_primary_address, -secondary_address : fmh_gpib_secondary_address, -serial_poll_response2 : fmh_gpib_serial_poll_response2, -serial_poll_status : fmh_gpib_serial_poll_status, -t1_delay : fmh_gpib_t1_delay, -return_to_local : fmh_gpib_return_to_local, +static gpib_interface_t fmh_gpib_unaccel_interface =3D { + .name =3D "fmh_gpib_unaccel", + .attach =3D fmh_gpib_attach_holdoff_all, + .detach =3D fmh_gpib_detach, + .read =3D fmh_gpib_read, + .write =3D fmh_gpib_write, + .command =3D fmh_gpib_command, + .take_control =3D fmh_gpib_take_control, + .go_to_standby =3D fmh_gpib_go_to_standby, + .request_system_control =3D fmh_gpib_request_system_control, + .interface_clear =3D fmh_gpib_interface_clear, + .remote_enable =3D fmh_gpib_remote_enable, + .enable_eos =3D fmh_gpib_enable_eos, + .disable_eos =3D fmh_gpib_disable_eos, + .parallel_poll =3D fmh_gpib_parallel_poll, + .parallel_poll_configure =3D fmh_gpib_parallel_poll_configure, + .parallel_poll_response =3D fmh_gpib_parallel_poll_response, + .local_parallel_poll_mode =3D fmh_gpib_local_parallel_poll_mode, + .line_status =3D fmh_gpib_line_status, + .update_status =3D fmh_gpib_update_status, + .primary_address =3D fmh_gpib_primary_address, + .secondary_address =3D fmh_gpib_secondary_address, + .serial_poll_response2 =3D fmh_gpib_serial_poll_response2, + .serial_poll_status =3D fmh_gpib_serial_poll_status, + .t1_delay =3D fmh_gpib_t1_delay, + .return_to_local =3D fmh_gpib_return_to_local, }; =20 -gpib_interface_t fmh_gpib_interface =3D { -name: "fmh_gpib", -attach : fmh_gpib_attach_holdoff_end, -detach : fmh_gpib_detach, -read : fmh_gpib_accel_read, -write : fmh_gpib_accel_write, -command : fmh_gpib_command, -take_control : fmh_gpib_take_control, -go_to_standby : fmh_gpib_go_to_standby, -request_system_control : fmh_gpib_request_system_control, -interface_clear : fmh_gpib_interface_clear, -remote_enable : fmh_gpib_remote_enable, -enable_eos : fmh_gpib_enable_eos, -disable_eos : fmh_gpib_disable_eos, -parallel_poll : fmh_gpib_parallel_poll, -parallel_poll_configure : fmh_gpib_parallel_poll_configure, -parallel_poll_response : fmh_gpib_parallel_poll_response, -local_parallel_poll_mode : fmh_gpib_local_parallel_poll_mode, -line_status : fmh_gpib_line_status, -update_status : fmh_gpib_update_status, -primary_address : fmh_gpib_primary_address, -secondary_address : fmh_gpib_secondary_address, -serial_poll_response2 : fmh_gpib_serial_poll_response2, -serial_poll_status : fmh_gpib_serial_poll_status, -t1_delay : fmh_gpib_t1_delay, -return_to_local : fmh_gpib_return_to_local, +static gpib_interface_t fmh_gpib_interface =3D { + .name =3D "fmh_gpib", + .attach =3D fmh_gpib_attach_holdoff_end, + .detach =3D fmh_gpib_detach, + .read =3D fmh_gpib_accel_read, + .write =3D fmh_gpib_accel_write, + .command =3D fmh_gpib_command, + .take_control =3D fmh_gpib_take_control, + .go_to_standby =3D fmh_gpib_go_to_standby, + .request_system_control =3D fmh_gpib_request_system_control, + .interface_clear =3D fmh_gpib_interface_clear, + .remote_enable =3D fmh_gpib_remote_enable, + .enable_eos =3D fmh_gpib_enable_eos, + .disable_eos =3D fmh_gpib_disable_eos, + .parallel_poll =3D fmh_gpib_parallel_poll, + .parallel_poll_configure =3D fmh_gpib_parallel_poll_configure, + .parallel_poll_response =3D fmh_gpib_parallel_poll_response, + .local_parallel_poll_mode =3D fmh_gpib_local_parallel_poll_mode, + .line_status =3D fmh_gpib_line_status, + .update_status =3D fmh_gpib_update_status, + .primary_address =3D fmh_gpib_primary_address, + .secondary_address =3D fmh_gpib_secondary_address, + .serial_poll_response2 =3D fmh_gpib_serial_poll_response2, + .serial_poll_status =3D fmh_gpib_serial_poll_status, + .t1_delay =3D fmh_gpib_t1_delay, + .return_to_local =3D fmh_gpib_return_to_local, }; =20 -gpib_interface_t fmh_gpib_pci_interface =3D { -name: "fmh_gpib_pci", -attach : fmh_gpib_pci_attach_holdoff_end, -detach : fmh_gpib_pci_detach, -read : fmh_gpib_fifo_read, -write : fmh_gpib_fifo_write, -command : fmh_gpib_command, -take_control : fmh_gpib_take_control, -go_to_standby : fmh_gpib_go_to_standby, -request_system_control : fmh_gpib_request_system_control, -interface_clear : fmh_gpib_interface_clear, -remote_enable : fmh_gpib_remote_enable, -enable_eos : fmh_gpib_enable_eos, -disable_eos : fmh_gpib_disable_eos, -parallel_poll : fmh_gpib_parallel_poll, -parallel_poll_configure : fmh_gpib_parallel_poll_configure, -parallel_poll_response : fmh_gpib_parallel_poll_response, -local_parallel_poll_mode : fmh_gpib_local_parallel_poll_mode, -line_status : fmh_gpib_line_status, -update_status : fmh_gpib_update_status, -primary_address : fmh_gpib_primary_address, -secondary_address : fmh_gpib_secondary_address, -serial_poll_response2 : fmh_gpib_serial_poll_response2, -serial_poll_status : fmh_gpib_serial_poll_status, -t1_delay : fmh_gpib_t1_delay, -return_to_local : fmh_gpib_return_to_local, +static gpib_interface_t fmh_gpib_pci_interface =3D { + .name =3D "fmh_gpib_pci", + .attach =3D fmh_gpib_pci_attach_holdoff_end, + .detach =3D fmh_gpib_pci_detach, + .read =3D fmh_gpib_fifo_read, + .write =3D fmh_gpib_fifo_write, + .command =3D fmh_gpib_command, + .take_control =3D fmh_gpib_take_control, + .go_to_standby =3D fmh_gpib_go_to_standby, + .request_system_control =3D fmh_gpib_request_system_control, + .interface_clear =3D fmh_gpib_interface_clear, + .remote_enable =3D fmh_gpib_remote_enable, + .enable_eos =3D fmh_gpib_enable_eos, + .disable_eos =3D fmh_gpib_disable_eos, + .parallel_poll =3D fmh_gpib_parallel_poll, + .parallel_poll_configure =3D fmh_gpib_parallel_poll_configure, + .parallel_poll_response =3D fmh_gpib_parallel_poll_response, + .local_parallel_poll_mode =3D fmh_gpib_local_parallel_poll_mode, + .line_status =3D fmh_gpib_line_status, + .update_status =3D fmh_gpib_update_status, + .primary_address =3D fmh_gpib_primary_address, + .secondary_address =3D fmh_gpib_secondary_address, + .serial_poll_response2 =3D fmh_gpib_serial_poll_response2, + .serial_poll_status =3D fmh_gpib_serial_poll_status, + .t1_delay =3D fmh_gpib_t1_delay, + .return_to_local =3D fmh_gpib_return_to_local, }; =20 -gpib_interface_t fmh_gpib_pci_unaccel_interface =3D { -name: "fmh_gpib_pci_unaccel", -attach : fmh_gpib_pci_attach_holdoff_all, -detach : fmh_gpib_pci_detach, -read : fmh_gpib_read, -write : fmh_gpib_write, -command : fmh_gpib_command, -take_control : fmh_gpib_take_control, -go_to_standby : fmh_gpib_go_to_standby, -request_system_control : fmh_gpib_request_system_control, -interface_clear : fmh_gpib_interface_clear, -remote_enable : fmh_gpib_remote_enable, -enable_eos : fmh_gpib_enable_eos, -disable_eos : fmh_gpib_disable_eos, -parallel_poll : fmh_gpib_parallel_poll, -parallel_poll_configure : fmh_gpib_parallel_poll_configure, -parallel_poll_response : fmh_gpib_parallel_poll_response, -local_parallel_poll_mode : fmh_gpib_local_parallel_poll_mode, -line_status : fmh_gpib_line_status, -update_status : fmh_gpib_update_status, -primary_address : fmh_gpib_primary_address, -secondary_address : fmh_gpib_secondary_address, -serial_poll_response2 : fmh_gpib_serial_poll_response2, -serial_poll_status : fmh_gpib_serial_poll_status, -t1_delay : fmh_gpib_t1_delay, -return_to_local : fmh_gpib_return_to_local, +static gpib_interface_t fmh_gpib_pci_unaccel_interface =3D { + .name =3D "fmh_gpib_pci_unaccel", + .attach =3D fmh_gpib_pci_attach_holdoff_all, + .detach =3D fmh_gpib_pci_detach, + .read =3D fmh_gpib_read, + .write =3D fmh_gpib_write, + .command =3D fmh_gpib_command, + .take_control =3D fmh_gpib_take_control, + .go_to_standby =3D fmh_gpib_go_to_standby, + .request_system_control =3D fmh_gpib_request_system_control, + .interface_clear =3D fmh_gpib_interface_clear, + .remote_enable =3D fmh_gpib_remote_enable, + .enable_eos =3D fmh_gpib_enable_eos, + .disable_eos =3D fmh_gpib_disable_eos, + .parallel_poll =3D fmh_gpib_parallel_poll, + .parallel_poll_configure =3D fmh_gpib_parallel_poll_configure, + .parallel_poll_response =3D fmh_gpib_parallel_poll_response, + .local_parallel_poll_mode =3D fmh_gpib_local_parallel_poll_mode, + .line_status =3D fmh_gpib_line_status, + .update_status =3D fmh_gpib_update_status, + .primary_address =3D fmh_gpib_primary_address, + .secondary_address =3D fmh_gpib_secondary_address, + .serial_poll_response2 =3D fmh_gpib_serial_poll_response2, + .serial_poll_status =3D fmh_gpib_serial_poll_status, + .t1_delay =3D fmh_gpib_t1_delay, + .return_to_local =3D fmh_gpib_return_to_local, }; =20 irqreturn_t fmh_gpib_internal_interrupt(gpib_board_t *board) diff --git a/drivers/staging/gpib/gpio/gpib_bitbang.c b/drivers/staging/gpi= b/gpio/gpib_bitbang.c index 057f9264de34..01c5b826ac47 100644 --- a/drivers/staging/gpib/gpio/gpib_bitbang.c +++ b/drivers/staging/gpib/gpio/gpib_bitbang.c @@ -1312,31 +1312,31 @@ static int bb_attach(gpib_board_t *board, const gpi= b_board_config_t *config) return retval; } =20 -gpib_interface_t bb_interface =3D { -name: NAME, -attach : bb_attach, -detach : bb_detach, -read : bb_read, -write : bb_write, -command : bb_command, -take_control : bb_take_control, -go_to_standby : bb_go_to_standby, -request_system_control : bb_request_system_control, -interface_clear : bb_interface_clear, -remote_enable : bb_remote_enable, -enable_eos : bb_enable_eos, -disable_eos : bb_disable_eos, -parallel_poll : bb_parallel_poll, -parallel_poll_configure : bb_parallel_poll_configure, -parallel_poll_response : bb_parallel_poll_response, -line_status : bb_line_status, -update_status : bb_update_status, -primary_address : bb_primary_address, -secondary_address : bb_secondary_address, -serial_poll_response : bb_serial_poll_response, -serial_poll_status : bb_serial_poll_status, -t1_delay : bb_t1_delay, -return_to_local : bb_return_to_local, +static gpib_interface_t bb_interface =3D { + .name =3D NAME, + .attach =3D bb_attach, + .detach =3D bb_detach, + .read =3D bb_read, + .write =3D bb_write, + .command =3D bb_command, + .take_control =3D bb_take_control, + .go_to_standby =3D bb_go_to_standby, + .request_system_control =3D bb_request_system_control, + .interface_clear =3D bb_interface_clear, + .remote_enable =3D bb_remote_enable, + .enable_eos =3D bb_enable_eos, + .disable_eos =3D bb_disable_eos, + .parallel_poll =3D bb_parallel_poll, + .parallel_poll_configure =3D bb_parallel_poll_configure, + .parallel_poll_response =3D bb_parallel_poll_response, + .line_status =3D bb_line_status, + .update_status =3D bb_update_status, + .primary_address =3D bb_primary_address, + .secondary_address =3D bb_secondary_address, + .serial_poll_response =3D bb_serial_poll_response, + .serial_poll_status =3D bb_serial_poll_status, + .t1_delay =3D bb_t1_delay, + .return_to_local =3D bb_return_to_local, }; =20 static int __init bb_init_module(void) diff --git a/drivers/staging/gpib/hp_82335/hp82335.c b/drivers/staging/gpib= /hp_82335/hp82335.c index 45157ad65d53..38dbda13a097 100644 --- a/drivers/staging/gpib/hp_82335/hp82335.c +++ b/drivers/staging/gpib/hp_82335/hp82335.c @@ -172,32 +172,32 @@ void hp82335_return_to_local(gpib_board_t *board) tms9914_return_to_local(board, &priv->tms9914_priv); } =20 -gpib_interface_t hp82335_interface =3D { -name: "hp82335", -attach : hp82335_attach, -detach : hp82335_detach, -read : hp82335_read, -write : hp82335_write, -command : hp82335_command, -request_system_control : hp82335_request_system_control, -take_control : hp82335_take_control, -go_to_standby : hp82335_go_to_standby, -interface_clear : hp82335_interface_clear, -remote_enable : hp82335_remote_enable, -enable_eos : hp82335_enable_eos, -disable_eos : hp82335_disable_eos, -parallel_poll : hp82335_parallel_poll, -parallel_poll_configure : hp82335_parallel_poll_configure, -parallel_poll_response : hp82335_parallel_poll_response, -local_parallel_poll_mode : NULL, // XXX -line_status : hp82335_line_status, -update_status : hp82335_update_status, -primary_address : hp82335_primary_address, -secondary_address : hp82335_secondary_address, -serial_poll_response : hp82335_serial_poll_response, -serial_poll_status : hp82335_serial_poll_status, -t1_delay : hp82335_t1_delay, -return_to_local : hp82335_return_to_local, +static gpib_interface_t hp82335_interface =3D { + .name =3D "hp82335", + .attach =3D hp82335_attach, + .detach =3D hp82335_detach, + .read =3D hp82335_read, + .write =3D hp82335_write, + .command =3D hp82335_command, + .request_system_control =3D hp82335_request_system_control, + .take_control =3D hp82335_take_control, + .go_to_standby =3D hp82335_go_to_standby, + .interface_clear =3D hp82335_interface_clear, + .remote_enable =3D hp82335_remote_enable, + .enable_eos =3D hp82335_enable_eos, + .disable_eos =3D hp82335_disable_eos, + .parallel_poll =3D hp82335_parallel_poll, + .parallel_poll_configure =3D hp82335_parallel_poll_configure, + .parallel_poll_response =3D hp82335_parallel_poll_response, + .local_parallel_poll_mode =3D NULL, // XXX + .line_status =3D hp82335_line_status, + .update_status =3D hp82335_update_status, + .primary_address =3D hp82335_primary_address, + .secondary_address =3D hp82335_secondary_address, + .serial_poll_response =3D hp82335_serial_poll_response, + .serial_poll_status =3D hp82335_serial_poll_status, + .t1_delay =3D hp82335_t1_delay, + .return_to_local =3D hp82335_return_to_local, }; =20 int hp82335_allocate_private(gpib_board_t *board) diff --git a/drivers/staging/gpib/hp_82335/hp82335.h b/drivers/staging/gpib= /hp_82335/hp82335.h index 5e5297af731a..4b185d7c5188 100644 --- a/drivers/staging/gpib/hp_82335/hp82335.h +++ b/drivers/staging/gpib/hp_82335/hp82335.h @@ -17,9 +17,6 @@ struct hp82335_priv { unsigned long raw_iobase; }; =20 -// interfaces -extern gpib_interface_t hp82335_interface; - // interface functions int hp82335_read(gpib_board_t *board, uint8_t *buffer, size_t length, int = *end, size_t *bytes_read); int hp82335_write(gpib_board_t *board, uint8_t *buffer, size_t length, diff --git a/drivers/staging/gpib/hp_82341/hp_82341.c b/drivers/staging/gpi= b/hp_82341/hp_82341.c index 4953dac1e177..da19470d5654 100644 --- a/drivers/staging/gpib/hp_82341/hp_82341.c +++ b/drivers/staging/gpib/hp_82341/hp_82341.c @@ -402,59 +402,59 @@ void hp_82341_return_to_local(gpib_board_t *board) tms9914_return_to_local(board, &priv->tms9914_priv); } =20 -gpib_interface_t hp_82341_unaccel_interface =3D { -name: "hp_82341_unaccel", -attach : hp_82341_attach, -detach : hp_82341_detach, -read : hp_82341_read, -write : hp_82341_write, -command : hp_82341_command, -request_system_control : hp_82341_request_system_control, -take_control : hp_82341_take_control, -go_to_standby : hp_82341_go_to_standby, -interface_clear : hp_82341_interface_clear, -remote_enable : hp_82341_remote_enable, -enable_eos : hp_82341_enable_eos, -disable_eos : hp_82341_disable_eos, -parallel_poll : hp_82341_parallel_poll, -parallel_poll_configure : hp_82341_parallel_poll_configure, -parallel_poll_response : hp_82341_parallel_poll_response, -local_parallel_poll_mode : NULL, // XXX -line_status : hp_82341_line_status, -update_status : hp_82341_update_status, -primary_address : hp_82341_primary_address, -secondary_address : hp_82341_secondary_address, -serial_poll_response : hp_82341_serial_poll_response, -serial_poll_status : hp_82341_serial_poll_status, -t1_delay : hp_82341_t1_delay, -return_to_local : hp_82341_return_to_local, +static gpib_interface_t hp_82341_unaccel_interface =3D { + .name =3D "hp_82341_unaccel", + .attach =3D hp_82341_attach, + .detach =3D hp_82341_detach, + .read =3D hp_82341_read, + .write =3D hp_82341_write, + .command =3D hp_82341_command, + .request_system_control =3D hp_82341_request_system_control, + .take_control =3D hp_82341_take_control, + .go_to_standby =3D hp_82341_go_to_standby, + .interface_clear =3D hp_82341_interface_clear, + .remote_enable =3D hp_82341_remote_enable, + .enable_eos =3D hp_82341_enable_eos, + .disable_eos =3D hp_82341_disable_eos, + .parallel_poll =3D hp_82341_parallel_poll, + .parallel_poll_configure =3D hp_82341_parallel_poll_configure, + .parallel_poll_response =3D hp_82341_parallel_poll_response, + .local_parallel_poll_mode =3D NULL, // XXX + .line_status =3D hp_82341_line_status, + .update_status =3D hp_82341_update_status, + .primary_address =3D hp_82341_primary_address, + .secondary_address =3D hp_82341_secondary_address, + .serial_poll_response =3D hp_82341_serial_poll_response, + .serial_poll_status =3D hp_82341_serial_poll_status, + .t1_delay =3D hp_82341_t1_delay, + .return_to_local =3D hp_82341_return_to_local, }; =20 -gpib_interface_t hp_82341_interface =3D { -name: "hp_82341", -attach : hp_82341_attach, -detach : hp_82341_detach, -read : hp_82341_accel_read, -write : hp_82341_accel_write, -command : hp_82341_command, -request_system_control : hp_82341_request_system_control, -take_control : hp_82341_take_control, -go_to_standby : hp_82341_go_to_standby, -interface_clear : hp_82341_interface_clear, -remote_enable : hp_82341_remote_enable, -enable_eos : hp_82341_enable_eos, -disable_eos : hp_82341_disable_eos, -parallel_poll : hp_82341_parallel_poll, -parallel_poll_configure : hp_82341_parallel_poll_configure, -parallel_poll_response : hp_82341_parallel_poll_response, -local_parallel_poll_mode : NULL, // XXX -line_status : hp_82341_line_status, -update_status : hp_82341_update_status, -primary_address : hp_82341_primary_address, -secondary_address : hp_82341_secondary_address, -serial_poll_response : hp_82341_serial_poll_response, -t1_delay : hp_82341_t1_delay, -return_to_local : hp_82341_return_to_local, +static gpib_interface_t hp_82341_interface =3D { + .name =3D "hp_82341", + .attach =3D hp_82341_attach, + .detach =3D hp_82341_detach, + .read =3D hp_82341_accel_read, + .write =3D hp_82341_accel_write, + .command =3D hp_82341_command, + .request_system_control =3D hp_82341_request_system_control, + .take_control =3D hp_82341_take_control, + .go_to_standby =3D hp_82341_go_to_standby, + .interface_clear =3D hp_82341_interface_clear, + .remote_enable =3D hp_82341_remote_enable, + .enable_eos =3D hp_82341_enable_eos, + .disable_eos =3D hp_82341_disable_eos, + .parallel_poll =3D hp_82341_parallel_poll, + .parallel_poll_configure =3D hp_82341_parallel_poll_configure, + .parallel_poll_response =3D hp_82341_parallel_poll_response, + .local_parallel_poll_mode =3D NULL, // XXX + .line_status =3D hp_82341_line_status, + .update_status =3D hp_82341_update_status, + .primary_address =3D hp_82341_primary_address, + .secondary_address =3D hp_82341_secondary_address, + .serial_poll_response =3D hp_82341_serial_poll_response, + .t1_delay =3D hp_82341_t1_delay, + .return_to_local =3D hp_82341_return_to_local, }; =20 int hp_82341_allocate_private(gpib_board_t *board) diff --git a/drivers/staging/gpib/hp_82341/hp_82341.h b/drivers/staging/gpi= b/hp_82341/hp_82341.h index 7c391860b399..0065ebd9747c 100644 --- a/drivers/staging/gpib/hp_82341/hp_82341.h +++ b/drivers/staging/gpib/hp_82341/hp_82341.h @@ -26,8 +26,6 @@ struct hp_82341_priv { enum hp_82341_hardware_version hw_version; }; =20 -// interfaces -extern gpib_interface_t hp_82341_interface; =20 // interface functions int hp_82341_accel_read(gpib_board_t *board, uint8_t *buffer, size_t lengt= h, int *end, diff --git a/drivers/staging/gpib/ines/ines.h b/drivers/staging/gpib/ines/i= nes.h index 7e8302619998..4e243d7951af 100644 --- a/drivers/staging/gpib/ines/ines.h +++ b/drivers/staging/gpib/ines/ines.h @@ -35,13 +35,6 @@ struct ines_priv { u8 extend_mode_bits; }; =20 -// interfaces -extern gpib_interface_t ines_pci_interface; -extern gpib_interface_t ines_pci_accel_interface; -extern gpib_interface_t ines_pcmcia_interface; -extern gpib_interface_t ines_pcmcia_accel_interface; -extern gpib_interface_t ines_pcmcia_unaccel_interface; - // interface functions int ines_read(gpib_board_t *board, uint8_t *buffer, size_t length, int *en= d, size_t *bytes_read); int ines_write(gpib_board_t *board, uint8_t *buffer, size_t length, diff --git a/drivers/staging/gpib/ines/ines_gpib.c b/drivers/staging/gpib/i= nes/ines_gpib.c index 9d4bbb8e8a75..a72074639e3e 100644 --- a/drivers/staging/gpib/ines/ines_gpib.c +++ b/drivers/staging/gpib/ines/ines_gpib.c @@ -540,116 +540,116 @@ void ines_return_to_local(gpib_board_t *board) nec7210_return_to_local(board, &priv->nec7210_priv); } =20 -gpib_interface_t ines_pci_unaccel_interface =3D { -name: "ines_pci_unaccel", -attach : ines_pci_attach, -detach : ines_pci_detach, -read : ines_read, -write : ines_write, -command : ines_command, -take_control : ines_take_control, -go_to_standby : ines_go_to_standby, -request_system_control : ines_request_system_control, -interface_clear : ines_interface_clear, -remote_enable : ines_remote_enable, -enable_eos : ines_enable_eos, -disable_eos : ines_disable_eos, -parallel_poll : ines_parallel_poll, -parallel_poll_configure : ines_parallel_poll_configure, -parallel_poll_response : ines_parallel_poll_response, -local_parallel_poll_mode : NULL, // XXX -line_status : ines_line_status, -update_status : ines_update_status, -primary_address : ines_primary_address, -secondary_address : ines_secondary_address, -serial_poll_response : ines_serial_poll_response, -serial_poll_status : ines_serial_poll_status, -t1_delay : ines_t1_delay, -return_to_local : ines_return_to_local, +static gpib_interface_t ines_pci_unaccel_interface =3D { + .name =3D "ines_pci_unaccel", + .attach =3D ines_pci_attach, + .detach =3D ines_pci_detach, + .read =3D ines_read, + .write =3D ines_write, + .command =3D ines_command, + .take_control =3D ines_take_control, + .go_to_standby =3D ines_go_to_standby, + .request_system_control =3D ines_request_system_control, + .interface_clear =3D ines_interface_clear, + .remote_enable =3D ines_remote_enable, + .enable_eos =3D ines_enable_eos, + .disable_eos =3D ines_disable_eos, + .parallel_poll =3D ines_parallel_poll, + .parallel_poll_configure =3D ines_parallel_poll_configure, + .parallel_poll_response =3D ines_parallel_poll_response, + .local_parallel_poll_mode =3D NULL, // XXX + .line_status =3D ines_line_status, + .update_status =3D ines_update_status, + .primary_address =3D ines_primary_address, + .secondary_address =3D ines_secondary_address, + .serial_poll_response =3D ines_serial_poll_response, + .serial_poll_status =3D ines_serial_poll_status, + .t1_delay =3D ines_t1_delay, + .return_to_local =3D ines_return_to_local, }; =20 -gpib_interface_t ines_pci_interface =3D { -name: "ines_pci", -attach : ines_pci_accel_attach, -detach : ines_pci_detach, -read : ines_accel_read, -write : ines_accel_write, -command : ines_command, -take_control : ines_take_control, -go_to_standby : ines_go_to_standby, -request_system_control : ines_request_system_control, -interface_clear : ines_interface_clear, -remote_enable : ines_remote_enable, -enable_eos : ines_enable_eos, -disable_eos : ines_disable_eos, -parallel_poll : ines_parallel_poll, -parallel_poll_configure : ines_parallel_poll_configure, -parallel_poll_response : ines_parallel_poll_response, -local_parallel_poll_mode : NULL, // XXX -line_status : ines_line_status, -update_status : ines_update_status, -primary_address : ines_primary_address, -secondary_address : ines_secondary_address, -serial_poll_response : ines_serial_poll_response, -serial_poll_status : ines_serial_poll_status, -t1_delay : ines_t1_delay, -return_to_local : ines_return_to_local, +static gpib_interface_t ines_pci_interface =3D { + .name =3D "ines_pci", + .attach =3D ines_pci_accel_attach, + .detach =3D ines_pci_detach, + .read =3D ines_accel_read, + .write =3D ines_accel_write, + .command =3D ines_command, + .take_control =3D ines_take_control, + .go_to_standby =3D ines_go_to_standby, + .request_system_control =3D ines_request_system_control, + .interface_clear =3D ines_interface_clear, + .remote_enable =3D ines_remote_enable, + .enable_eos =3D ines_enable_eos, + .disable_eos =3D ines_disable_eos, + .parallel_poll =3D ines_parallel_poll, + .parallel_poll_configure =3D ines_parallel_poll_configure, + .parallel_poll_response =3D ines_parallel_poll_response, + .local_parallel_poll_mode =3D NULL, // XXX + .line_status =3D ines_line_status, + .update_status =3D ines_update_status, + .primary_address =3D ines_primary_address, + .secondary_address =3D ines_secondary_address, + .serial_poll_response =3D ines_serial_poll_response, + .serial_poll_status =3D ines_serial_poll_status, + .t1_delay =3D ines_t1_delay, + .return_to_local =3D ines_return_to_local, }; =20 -gpib_interface_t ines_pci_accel_interface =3D { -name: "ines_pci_accel", -attach : ines_pci_accel_attach, -detach : ines_pci_detach, -read : ines_accel_read, -write : ines_accel_write, -command : ines_command, -take_control : ines_take_control, -go_to_standby : ines_go_to_standby, -request_system_control : ines_request_system_control, -interface_clear : ines_interface_clear, -remote_enable : ines_remote_enable, -enable_eos : ines_enable_eos, -disable_eos : ines_disable_eos, -parallel_poll : ines_parallel_poll, -parallel_poll_configure : ines_parallel_poll_configure, -parallel_poll_response : ines_parallel_poll_response, -local_parallel_poll_mode : NULL, // XXX -line_status : ines_line_status, -update_status : ines_update_status, -primary_address : ines_primary_address, -secondary_address : ines_secondary_address, -serial_poll_response : ines_serial_poll_response, -serial_poll_status : ines_serial_poll_status, -t1_delay : ines_t1_delay, -return_to_local : ines_return_to_local, +static gpib_interface_t ines_pci_accel_interface =3D { + .name =3D "ines_pci_accel", + .attach =3D ines_pci_accel_attach, + .detach =3D ines_pci_detach, + .read =3D ines_accel_read, + .write =3D ines_accel_write, + .command =3D ines_command, + .take_control =3D ines_take_control, + .go_to_standby =3D ines_go_to_standby, + .request_system_control =3D ines_request_system_control, + .interface_clear =3D ines_interface_clear, + .remote_enable =3D ines_remote_enable, + .enable_eos =3D ines_enable_eos, + .disable_eos =3D ines_disable_eos, + .parallel_poll =3D ines_parallel_poll, + .parallel_poll_configure =3D ines_parallel_poll_configure, + .parallel_poll_response =3D ines_parallel_poll_response, + .local_parallel_poll_mode =3D NULL, // XXX + .line_status =3D ines_line_status, + .update_status =3D ines_update_status, + .primary_address =3D ines_primary_address, + .secondary_address =3D ines_secondary_address, + .serial_poll_response =3D ines_serial_poll_response, + .serial_poll_status =3D ines_serial_poll_status, + .t1_delay =3D ines_t1_delay, + .return_to_local =3D ines_return_to_local, }; =20 -gpib_interface_t ines_isa_interface =3D { -name: "ines_isa", -attach : ines_isa_attach, -detach : ines_isa_detach, -read : ines_accel_read, -write : ines_accel_write, -command : ines_command, -take_control : ines_take_control, -go_to_standby : ines_go_to_standby, -request_system_control : ines_request_system_control, -interface_clear : ines_interface_clear, -remote_enable : ines_remote_enable, -enable_eos : ines_enable_eos, -disable_eos : ines_disable_eos, -parallel_poll : ines_parallel_poll, -parallel_poll_configure : ines_parallel_poll_configure, -parallel_poll_response : ines_parallel_poll_response, -local_parallel_poll_mode : NULL, // XXX -line_status : ines_line_status, -update_status : ines_update_status, -primary_address : ines_primary_address, -secondary_address : ines_secondary_address, -serial_poll_response : ines_serial_poll_response, -serial_poll_status : ines_serial_poll_status, -t1_delay : ines_t1_delay, -return_to_local : ines_return_to_local, +static gpib_interface_t ines_isa_interface =3D { + .name =3D "ines_isa", + .attach =3D ines_isa_attach, + .detach =3D ines_isa_detach, + .read =3D ines_accel_read, + .write =3D ines_accel_write, + .command =3D ines_command, + .take_control =3D ines_take_control, + .go_to_standby =3D ines_go_to_standby, + .request_system_control =3D ines_request_system_control, + .interface_clear =3D ines_interface_clear, + .remote_enable =3D ines_remote_enable, + .enable_eos =3D ines_enable_eos, + .disable_eos =3D ines_disable_eos, + .parallel_poll =3D ines_parallel_poll, + .parallel_poll_configure =3D ines_parallel_poll_configure, + .parallel_poll_response =3D ines_parallel_poll_response, + .local_parallel_poll_mode =3D NULL, // XXX + .line_status =3D ines_line_status, + .update_status =3D ines_update_status, + .primary_address =3D ines_primary_address, + .secondary_address =3D ines_secondary_address, + .serial_poll_response =3D ines_serial_poll_response, + .serial_poll_status =3D ines_serial_poll_status, + .t1_delay =3D ines_t1_delay, + .return_to_local =3D ines_return_to_local, }; =20 static int ines_allocate_private(gpib_board_t *board) @@ -1233,88 +1233,88 @@ void ines_pcmcia_cleanup_module(void) pcmcia_unregister_driver(&ines_gpib_cs_driver); } =20 -gpib_interface_t ines_pcmcia_unaccel_interface =3D { -name: "ines_pcmcia_unaccel", -attach : ines_pcmcia_attach, -detach : ines_pcmcia_detach, -read : ines_read, -write : ines_write, -command : ines_command, -take_control : ines_take_control, -go_to_standby : ines_go_to_standby, -request_system_control : ines_request_system_control, -interface_clear : ines_interface_clear, -remote_enable : ines_remote_enable, -enable_eos : ines_enable_eos, -disable_eos : ines_disable_eos, -parallel_poll : ines_parallel_poll, -parallel_poll_configure : ines_parallel_poll_configure, -parallel_poll_response : ines_parallel_poll_response, -local_parallel_poll_mode : NULL, // XXX -line_status : ines_line_status, -update_status : ines_update_status, -primary_address : ines_primary_address, -secondary_address : ines_secondary_address, -serial_poll_response : ines_serial_poll_response, -serial_poll_status : ines_serial_poll_status, -t1_delay : ines_t1_delay, -return_to_local : ines_return_to_local, +static gpib_interface_t ines_pcmcia_unaccel_interface =3D { + .name =3D "ines_pcmcia_unaccel", + .attach =3D ines_pcmcia_attach, + .detach =3D ines_pcmcia_detach, + .read =3D ines_read, + .write =3D ines_write, + .command =3D ines_command, + .take_control =3D ines_take_control, + .go_to_standby =3D ines_go_to_standby, + .request_system_control =3D ines_request_system_control, + .interface_clear =3D ines_interface_clear, + .remote_enable =3D ines_remote_enable, + .enable_eos =3D ines_enable_eos, + .disable_eos =3D ines_disable_eos, + .parallel_poll =3D ines_parallel_poll, + .parallel_poll_configure =3D ines_parallel_poll_configure, + .parallel_poll_response =3D ines_parallel_poll_response, + .local_parallel_poll_mode =3D NULL, // XXX + .line_status =3D ines_line_status, + .update_status =3D ines_update_status, + .primary_address =3D ines_primary_address, + .secondary_address =3D ines_secondary_address, + .serial_poll_response =3D ines_serial_poll_response, + .serial_poll_status =3D ines_serial_poll_status, + .t1_delay =3D ines_t1_delay, + .return_to_local =3D ines_return_to_local, }; =20 -gpib_interface_t ines_pcmcia_accel_interface =3D { -name: "ines_pcmcia_accel", -attach : ines_pcmcia_accel_attach, -detach : ines_pcmcia_detach, -read : ines_accel_read, -write : ines_accel_write, -command : ines_command, -take_control : ines_take_control, -go_to_standby : ines_go_to_standby, -request_system_control : ines_request_system_control, -interface_clear : ines_interface_clear, -remote_enable : ines_remote_enable, -enable_eos : ines_enable_eos, -disable_eos : ines_disable_eos, -parallel_poll : ines_parallel_poll, -parallel_poll_configure : ines_parallel_poll_configure, -parallel_poll_response : ines_parallel_poll_response, -local_parallel_poll_mode : NULL, // XXX -line_status : ines_line_status, -update_status : ines_update_status, -primary_address : ines_primary_address, -secondary_address : ines_secondary_address, -serial_poll_response : ines_serial_poll_response, -serial_poll_status : ines_serial_poll_status, -t1_delay : ines_t1_delay, -return_to_local : ines_return_to_local, +static gpib_interface_t ines_pcmcia_accel_interface =3D { + .name =3D "ines_pcmcia_accel", + .attach =3D ines_pcmcia_accel_attach, + .detach =3D ines_pcmcia_detach, + .read =3D ines_accel_read, + .write =3D ines_accel_write, + .command =3D ines_command, + .take_control =3D ines_take_control, + .go_to_standby =3D ines_go_to_standby, + .request_system_control =3D ines_request_system_control, + .interface_clear =3D ines_interface_clear, + .remote_enable =3D ines_remote_enable, + .enable_eos =3D ines_enable_eos, + .disable_eos =3D ines_disable_eos, + .parallel_poll =3D ines_parallel_poll, + .parallel_poll_configure =3D ines_parallel_poll_configure, + .parallel_poll_response =3D ines_parallel_poll_response, + .local_parallel_poll_mode =3D NULL, // XXX + .line_status =3D ines_line_status, + .update_status =3D ines_update_status, + .primary_address =3D ines_primary_address, + .secondary_address =3D ines_secondary_address, + .serial_poll_response =3D ines_serial_poll_response, + .serial_poll_status =3D ines_serial_poll_status, + .t1_delay =3D ines_t1_delay, + .return_to_local =3D ines_return_to_local, }; =20 -gpib_interface_t ines_pcmcia_interface =3D { -name: "ines_pcmcia", -attach : ines_pcmcia_accel_attach, -detach : ines_pcmcia_detach, -read : ines_accel_read, -write : ines_accel_write, -command : ines_command, -take_control : ines_take_control, -go_to_standby : ines_go_to_standby, -request_system_control : ines_request_system_control, -interface_clear : ines_interface_clear, -remote_enable : ines_remote_enable, -enable_eos : ines_enable_eos, -disable_eos : ines_disable_eos, -parallel_poll : ines_parallel_poll, -parallel_poll_configure : ines_parallel_poll_configure, -parallel_poll_response : ines_parallel_poll_response, -local_parallel_poll_mode : NULL, // XXX -line_status : ines_line_status, -update_status : ines_update_status, -primary_address : ines_primary_address, -secondary_address : ines_secondary_address, -serial_poll_response : ines_serial_poll_response, -serial_poll_status : ines_serial_poll_status, -t1_delay : ines_t1_delay, -return_to_local : ines_return_to_local, +static gpib_interface_t ines_pcmcia_interface =3D { + .name =3D "ines_pcmcia", + .attach =3D ines_pcmcia_accel_attach, + .detach =3D ines_pcmcia_detach, + .read =3D ines_accel_read, + .write =3D ines_accel_write, + .command =3D ines_command, + .take_control =3D ines_take_control, + .go_to_standby =3D ines_go_to_standby, + .request_system_control =3D ines_request_system_control, + .interface_clear =3D ines_interface_clear, + .remote_enable =3D ines_remote_enable, + .enable_eos =3D ines_enable_eos, + .disable_eos =3D ines_disable_eos, + .parallel_poll =3D ines_parallel_poll, + .parallel_poll_configure =3D ines_parallel_poll_configure, + .parallel_poll_response =3D ines_parallel_poll_response, + .local_parallel_poll_mode =3D NULL, // XXX + .line_status =3D ines_line_status, + .update_status =3D ines_update_status, + .primary_address =3D ines_primary_address, + .secondary_address =3D ines_secondary_address, + .serial_poll_response =3D ines_serial_poll_response, + .serial_poll_status =3D ines_serial_poll_status, + .t1_delay =3D ines_t1_delay, + .return_to_local =3D ines_return_to_local, }; =20 irqreturn_t ines_pcmcia_interrupt(int irq, void *arg) diff --git a/drivers/staging/gpib/lpvo_usb_gpib/lpvo_usb_gpib.c b/drivers/s= taging/gpib/lpvo_usb_gpib/lpvo_usb_gpib.c index 69cf4cb284f9..d91def4baa09 100644 --- a/drivers/staging/gpib/lpvo_usb_gpib/lpvo_usb_gpib.c +++ b/drivers/staging/gpib/lpvo_usb_gpib/lpvo_usb_gpib.c @@ -1131,33 +1131,33 @@ static unsigned int usb_gpib_t1_delay(gpib_board_t = *board, unsigned int nano_sec * *** module dispatch table and init/exit functions *** */ =20 -gpib_interface_t usb_gpib_interface =3D { -name: NAME, -attach : usb_gpib_attach, -detach : usb_gpib_detach, -read : usb_gpib_read, -write : usb_gpib_write, -command : usb_gpib_command, -take_control : usb_gpib_take_control, -go_to_standby : usb_gpib_go_to_standby, -request_system_control : usb_gpib_request_system_control, -interface_clear : usb_gpib_interface_clear, -remote_enable : usb_gpib_remote_enable, -enable_eos : usb_gpib_enable_eos, -disable_eos : usb_gpib_disable_eos, -parallel_poll : usb_gpib_parallel_poll, -parallel_poll_configure : usb_gpib_parallel_poll_configure, -parallel_poll_response : usb_gpib_parallel_poll_response, -local_parallel_poll_mode : NULL, // XXX -line_status : usb_gpib_line_status, -update_status : usb_gpib_update_status, -primary_address : usb_gpib_primary_address, -secondary_address : usb_gpib_secondary_address, -serial_poll_response : usb_gpib_serial_poll_response, -serial_poll_status : usb_gpib_serial_poll_status, -t1_delay : usb_gpib_t1_delay, -return_to_local : usb_gpib_return_to_local, -skip_check_for_command_acceptors : 1 +static gpib_interface_t usb_gpib_interface =3D { + .name =3D NAME, + .attach =3D usb_gpib_attach, + .detach =3D usb_gpib_detach, + .read =3D usb_gpib_read, + .write =3D usb_gpib_write, + .command =3D usb_gpib_command, + .take_control =3D usb_gpib_take_control, + .go_to_standby =3D usb_gpib_go_to_standby, + .request_system_control =3D usb_gpib_request_system_control, + .interface_clear =3D usb_gpib_interface_clear, + .remote_enable =3D usb_gpib_remote_enable, + .enable_eos =3D usb_gpib_enable_eos, + .disable_eos =3D usb_gpib_disable_eos, + .parallel_poll =3D usb_gpib_parallel_poll, + .parallel_poll_configure =3D usb_gpib_parallel_poll_configure, + .parallel_poll_response =3D usb_gpib_parallel_poll_response, + .local_parallel_poll_mode =3D NULL, // XXX + .line_status =3D usb_gpib_line_status, + .update_status =3D usb_gpib_update_status, + .primary_address =3D usb_gpib_primary_address, + .secondary_address =3D usb_gpib_secondary_address, + .serial_poll_response =3D usb_gpib_serial_poll_response, + .serial_poll_status =3D usb_gpib_serial_poll_status, + .t1_delay =3D usb_gpib_t1_delay, + .return_to_local =3D usb_gpib_return_to_local, + .skip_check_for_command_acceptors =3D 1 }; =20 /* diff --git a/drivers/staging/gpib/ni_usb/ni_usb_gpib.c b/drivers/staging/gp= ib/ni_usb/ni_usb_gpib.c index 3c4132fd6de9..2c0a0d7e36c6 100644 --- a/drivers/staging/gpib/ni_usb/ni_usb_gpib.c +++ b/drivers/staging/gpib/ni_usb/ni_usb_gpib.c @@ -2351,33 +2351,33 @@ static void ni_usb_detach(gpib_board_t *board) mutex_unlock(&ni_usb_hotplug_lock); } =20 -gpib_interface_t ni_usb_gpib_interface =3D { -name: "ni_usb_b", -attach : ni_usb_attach, -detach : ni_usb_detach, -read : ni_usb_read, -write : ni_usb_write, -command : ni_usb_command, -take_control : ni_usb_take_control, -go_to_standby : ni_usb_go_to_standby, -request_system_control : ni_usb_request_system_control, -interface_clear : ni_usb_interface_clear, -remote_enable : ni_usb_remote_enable, -enable_eos : ni_usb_enable_eos, -disable_eos : ni_usb_disable_eos, -parallel_poll : ni_usb_parallel_poll, -parallel_poll_configure : ni_usb_parallel_poll_configure, -parallel_poll_response : ni_usb_parallel_poll_response, -local_parallel_poll_mode : NULL, // XXX -line_status : ni_usb_line_status, -update_status : ni_usb_update_status, -primary_address : ni_usb_primary_address, -secondary_address : ni_usb_secondary_address, -serial_poll_response : ni_usb_serial_poll_response, -serial_poll_status : ni_usb_serial_poll_status, -t1_delay : ni_usb_t1_delay, -return_to_local : ni_usb_return_to_local, -skip_check_for_command_acceptors : 1 +static gpib_interface_t ni_usb_gpib_interface =3D { + .name =3D "ni_usb_b", + .attach =3D ni_usb_attach, + .detach =3D ni_usb_detach, + .read =3D ni_usb_read, + .write =3D ni_usb_write, + .command =3D ni_usb_command, + .take_control =3D ni_usb_take_control, + .go_to_standby =3D ni_usb_go_to_standby, + .request_system_control =3D ni_usb_request_system_control, + .interface_clear =3D ni_usb_interface_clear, + .remote_enable =3D ni_usb_remote_enable, + .enable_eos =3D ni_usb_enable_eos, + .disable_eos =3D ni_usb_disable_eos, + .parallel_poll =3D ni_usb_parallel_poll, + .parallel_poll_configure =3D ni_usb_parallel_poll_configure, + .parallel_poll_response =3D ni_usb_parallel_poll_response, + .local_parallel_poll_mode =3D NULL, // XXX + .line_status =3D ni_usb_line_status, + .update_status =3D ni_usb_update_status, + .primary_address =3D ni_usb_primary_address, + .secondary_address =3D ni_usb_secondary_address, + .serial_poll_response =3D ni_usb_serial_poll_response, + .serial_poll_status =3D ni_usb_serial_poll_status, + .t1_delay =3D ni_usb_t1_delay, + .return_to_local =3D ni_usb_return_to_local, + .skip_check_for_command_acceptors =3D 1 }; =20 // Table with the USB-devices: just now only testing IDs diff --git a/drivers/staging/gpib/pc2/pc2_gpib.c b/drivers/staging/gpib/pc2= /pc2_gpib.c index a9aae563f60a..ee0eca59a934 100644 --- a/drivers/staging/gpib/pc2/pc2_gpib.c +++ b/drivers/staging/gpib/pc2/pc2_gpib.c @@ -238,116 +238,116 @@ static void pc2_return_to_local(gpib_board_t *board) nec7210_return_to_local(board, &priv->nec7210_priv); } =20 -gpib_interface_t pc2_interface =3D { -name: "pcII", -attach : pc2_attach, -detach : pc2_detach, -read : pc2_read, -write : pc2_write, -command : pc2_command, -take_control : pc2_take_control, -go_to_standby : pc2_go_to_standby, -request_system_control : pc2_request_system_control, -interface_clear : pc2_interface_clear, -remote_enable : pc2_remote_enable, -enable_eos : pc2_enable_eos, -disable_eos : pc2_disable_eos, -parallel_poll : pc2_parallel_poll, -parallel_poll_configure : pc2_parallel_poll_configure, -parallel_poll_response : pc2_parallel_poll_response, -local_parallel_poll_mode : NULL, // XXX -line_status : NULL, -update_status : pc2_update_status, -primary_address : pc2_primary_address, -secondary_address : pc2_secondary_address, -serial_poll_response : pc2_serial_poll_response, -serial_poll_status : pc2_serial_poll_status, -t1_delay : pc2_t1_delay, -return_to_local : pc2_return_to_local, +static gpib_interface_t pc2_interface =3D { + .name =3D "pcII", + .attach =3D pc2_attach, + .detach =3D pc2_detach, + .read =3D pc2_read, + .write =3D pc2_write, + .command =3D pc2_command, + .take_control =3D pc2_take_control, + .go_to_standby =3D pc2_go_to_standby, + .request_system_control =3D pc2_request_system_control, + .interface_clear =3D pc2_interface_clear, + .remote_enable =3D pc2_remote_enable, + .enable_eos =3D pc2_enable_eos, + .disable_eos =3D pc2_disable_eos, + .parallel_poll =3D pc2_parallel_poll, + .parallel_poll_configure =3D pc2_parallel_poll_configure, + .parallel_poll_response =3D pc2_parallel_poll_response, + .local_parallel_poll_mode =3D NULL, // XXX + .line_status =3D NULL, + .update_status =3D pc2_update_status, + .primary_address =3D pc2_primary_address, + .secondary_address =3D pc2_secondary_address, + .serial_poll_response =3D pc2_serial_poll_response, + .serial_poll_status =3D pc2_serial_poll_status, + .t1_delay =3D pc2_t1_delay, + .return_to_local =3D pc2_return_to_local, }; =20 -gpib_interface_t pc2a_interface =3D { -name: "pcIIa", -attach : pc2a_attach, -detach : pc2a_detach, -read : pc2_read, -write : pc2_write, -command : pc2_command, -take_control : pc2_take_control, -go_to_standby : pc2_go_to_standby, -request_system_control : pc2_request_system_control, -interface_clear : pc2_interface_clear, -remote_enable : pc2_remote_enable, -enable_eos : pc2_enable_eos, -disable_eos : pc2_disable_eos, -parallel_poll : pc2_parallel_poll, -parallel_poll_configure : pc2_parallel_poll_configure, -parallel_poll_response : pc2_parallel_poll_response, -local_parallel_poll_mode : NULL, // XXX -line_status : NULL, -update_status : pc2_update_status, -primary_address : pc2_primary_address, -secondary_address : pc2_secondary_address, -serial_poll_response : pc2_serial_poll_response, -serial_poll_status : pc2_serial_poll_status, -t1_delay : pc2_t1_delay, -return_to_local : pc2_return_to_local, +static gpib_interface_t pc2a_interface =3D { + .name =3D "pcIIa", + .attach =3D pc2a_attach, + .detach =3D pc2a_detach, + .read =3D pc2_read, + .write =3D pc2_write, + .command =3D pc2_command, + .take_control =3D pc2_take_control, + .go_to_standby =3D pc2_go_to_standby, + .request_system_control =3D pc2_request_system_control, + .interface_clear =3D pc2_interface_clear, + .remote_enable =3D pc2_remote_enable, + .enable_eos =3D pc2_enable_eos, + .disable_eos =3D pc2_disable_eos, + .parallel_poll =3D pc2_parallel_poll, + .parallel_poll_configure =3D pc2_parallel_poll_configure, + .parallel_poll_response =3D pc2_parallel_poll_response, + .local_parallel_poll_mode =3D NULL, // XXX + .line_status =3D NULL, + .update_status =3D pc2_update_status, + .primary_address =3D pc2_primary_address, + .secondary_address =3D pc2_secondary_address, + .serial_poll_response =3D pc2_serial_poll_response, + .serial_poll_status =3D pc2_serial_poll_status, + .t1_delay =3D pc2_t1_delay, + .return_to_local =3D pc2_return_to_local, }; =20 -gpib_interface_t pc2a_cb7210_interface =3D { -name: "pcIIa_cb7210", -attach : pc2a_cb7210_attach, -detach : pc2a_detach, -read : pc2_read, -write : pc2_write, -command : pc2_command, -take_control : pc2_take_control, -go_to_standby : pc2_go_to_standby, -request_system_control : pc2_request_system_control, -interface_clear : pc2_interface_clear, -remote_enable : pc2_remote_enable, -enable_eos : pc2_enable_eos, -disable_eos : pc2_disable_eos, -parallel_poll : pc2_parallel_poll, -parallel_poll_configure : pc2_parallel_poll_configure, -parallel_poll_response : pc2_parallel_poll_response, -local_parallel_poll_mode : NULL, // XXX -line_status : NULL, //XXX -update_status : pc2_update_status, -primary_address : pc2_primary_address, -secondary_address : pc2_secondary_address, -serial_poll_response : pc2_serial_poll_response, -serial_poll_status : pc2_serial_poll_status, -t1_delay : pc2_t1_delay, -return_to_local : pc2_return_to_local, +static gpib_interface_t pc2a_cb7210_interface =3D { + .name =3D "pcIIa_cb7210", + .attach =3D pc2a_cb7210_attach, + .detach =3D pc2a_detach, + .read =3D pc2_read, + .write =3D pc2_write, + .command =3D pc2_command, + .take_control =3D pc2_take_control, + .go_to_standby =3D pc2_go_to_standby, + .request_system_control =3D pc2_request_system_control, + .interface_clear =3D pc2_interface_clear, + .remote_enable =3D pc2_remote_enable, + .enable_eos =3D pc2_enable_eos, + .disable_eos =3D pc2_disable_eos, + .parallel_poll =3D pc2_parallel_poll, + .parallel_poll_configure =3D pc2_parallel_poll_configure, + .parallel_poll_response =3D pc2_parallel_poll_response, + .local_parallel_poll_mode =3D NULL, // XXX + .line_status =3D NULL, //XXX + .update_status =3D pc2_update_status, + .primary_address =3D pc2_primary_address, + .secondary_address =3D pc2_secondary_address, + .serial_poll_response =3D pc2_serial_poll_response, + .serial_poll_status =3D pc2_serial_poll_status, + .t1_delay =3D pc2_t1_delay, + .return_to_local =3D pc2_return_to_local, }; =20 -gpib_interface_t pc2_2a_interface =3D { -name: "pcII_IIa", -attach : pc2_2a_attach, -detach : pc2_2a_detach, -read : pc2_read, -write : pc2_write, -command : pc2_command, -take_control : pc2_take_control, -go_to_standby : pc2_go_to_standby, -request_system_control : pc2_request_system_control, -interface_clear : pc2_interface_clear, -remote_enable : pc2_remote_enable, -enable_eos : pc2_enable_eos, -disable_eos : pc2_disable_eos, -parallel_poll : pc2_parallel_poll, -parallel_poll_configure : pc2_parallel_poll_configure, -parallel_poll_response : pc2_parallel_poll_response, -local_parallel_poll_mode : NULL, // XXX -line_status : NULL, -update_status : pc2_update_status, -primary_address : pc2_primary_address, -secondary_address : pc2_secondary_address, -serial_poll_response : pc2_serial_poll_response, -serial_poll_status : pc2_serial_poll_status, -t1_delay : pc2_t1_delay, -return_to_local : pc2_return_to_local, +static gpib_interface_t pc2_2a_interface =3D { + .name =3D "pcII_IIa", + .attach =3D pc2_2a_attach, + .detach =3D pc2_2a_detach, + .read =3D pc2_read, + .write =3D pc2_write, + .command =3D pc2_command, + .take_control =3D pc2_take_control, + .go_to_standby =3D pc2_go_to_standby, + .request_system_control =3D pc2_request_system_control, + .interface_clear =3D pc2_interface_clear, + .remote_enable =3D pc2_remote_enable, + .enable_eos =3D pc2_enable_eos, + .disable_eos =3D pc2_disable_eos, + .parallel_poll =3D pc2_parallel_poll, + .parallel_poll_configure =3D pc2_parallel_poll_configure, + .parallel_poll_response =3D pc2_parallel_poll_response, + .local_parallel_poll_mode =3D NULL, // XXX + .line_status =3D NULL, + .update_status =3D pc2_update_status, + .primary_address =3D pc2_primary_address, + .secondary_address =3D pc2_secondary_address, + .serial_poll_response =3D pc2_serial_poll_response, + .serial_poll_status =3D pc2_serial_poll_status, + .t1_delay =3D pc2_t1_delay, + .return_to_local =3D pc2_return_to_local, }; =20 static int allocate_private(gpib_board_t *board) diff --git a/drivers/staging/gpib/tnt4882/tnt4882_gpib.c b/drivers/staging/= gpib/tnt4882/tnt4882_gpib.c index a2549231525b..1b0d4fdf28cf 100644 --- a/drivers/staging/gpib/tnt4882/tnt4882_gpib.c +++ b/drivers/staging/gpib/tnt4882/tnt4882_gpib.c @@ -894,285 +894,285 @@ void tnt4882_return_to_local(gpib_board_t *board) nec7210_return_to_local(board, &priv->nec7210_priv); } =20 -gpib_interface_t ni_pci_interface =3D { -name: "ni_pci", -attach : ni_pci_attach, -detach : ni_pci_detach, -read : tnt4882_accel_read, -write : tnt4882_accel_write, -command : tnt4882_command, -take_control : tnt4882_take_control, -go_to_standby : tnt4882_go_to_standby, -request_system_control : tnt4882_request_system_control, -interface_clear : tnt4882_interface_clear, -remote_enable : tnt4882_remote_enable, -enable_eos : tnt4882_enable_eos, -disable_eos : tnt4882_disable_eos, -parallel_poll : tnt4882_parallel_poll, -parallel_poll_configure : tnt4882_parallel_poll_configure, -parallel_poll_response : tnt4882_parallel_poll_response, -local_parallel_poll_mode : NULL, // XXX -line_status : tnt4882_line_status, -update_status : tnt4882_update_status, -primary_address : tnt4882_primary_address, -secondary_address : tnt4882_secondary_address, -serial_poll_response2 : tnt4882_serial_poll_response2, -serial_poll_status : tnt4882_serial_poll_status, -t1_delay : tnt4882_t1_delay, -return_to_local : tnt4882_return_to_local, +static gpib_interface_t ni_pci_interface =3D { + .name =3D "ni_pci", + .attach =3D ni_pci_attach, + .detach =3D ni_pci_detach, + .read =3D tnt4882_accel_read, + .write =3D tnt4882_accel_write, + .command =3D tnt4882_command, + .take_control =3D tnt4882_take_control, + .go_to_standby =3D tnt4882_go_to_standby, + .request_system_control =3D tnt4882_request_system_control, + .interface_clear =3D tnt4882_interface_clear, + .remote_enable =3D tnt4882_remote_enable, + .enable_eos =3D tnt4882_enable_eos, + .disable_eos =3D tnt4882_disable_eos, + .parallel_poll =3D tnt4882_parallel_poll, + .parallel_poll_configure =3D tnt4882_parallel_poll_configure, + .parallel_poll_response =3D tnt4882_parallel_poll_response, + .local_parallel_poll_mode =3D NULL, // XXX + .line_status =3D tnt4882_line_status, + .update_status =3D tnt4882_update_status, + .primary_address =3D tnt4882_primary_address, + .secondary_address =3D tnt4882_secondary_address, + .serial_poll_response2 =3D tnt4882_serial_poll_response2, + .serial_poll_status =3D tnt4882_serial_poll_status, + .t1_delay =3D tnt4882_t1_delay, + .return_to_local =3D tnt4882_return_to_local, }; =20 -gpib_interface_t ni_pci_accel_interface =3D { -name: "ni_pci_accel", -attach : ni_pci_attach, -detach : ni_pci_detach, -read : tnt4882_accel_read, -write : tnt4882_accel_write, -command : tnt4882_command, -take_control : tnt4882_take_control, -go_to_standby : tnt4882_go_to_standby, -request_system_control : tnt4882_request_system_control, -interface_clear : tnt4882_interface_clear, -remote_enable : tnt4882_remote_enable, -enable_eos : tnt4882_enable_eos, -disable_eos : tnt4882_disable_eos, -parallel_poll : tnt4882_parallel_poll, -parallel_poll_configure : tnt4882_parallel_poll_configure, -parallel_poll_response : tnt4882_parallel_poll_response, -local_parallel_poll_mode : NULL, // XXX -line_status : tnt4882_line_status, -update_status : tnt4882_update_status, -primary_address : tnt4882_primary_address, -secondary_address : tnt4882_secondary_address, -serial_poll_response2 : tnt4882_serial_poll_response2, -serial_poll_status : tnt4882_serial_poll_status, -t1_delay : tnt4882_t1_delay, -return_to_local : tnt4882_return_to_local, +static gpib_interface_t ni_pci_accel_interface =3D { + .name =3D "ni_pci_accel", + .attach =3D ni_pci_attach, + .detach =3D ni_pci_detach, + .read =3D tnt4882_accel_read, + .write =3D tnt4882_accel_write, + .command =3D tnt4882_command, + .take_control =3D tnt4882_take_control, + .go_to_standby =3D tnt4882_go_to_standby, + .request_system_control =3D tnt4882_request_system_control, + .interface_clear =3D tnt4882_interface_clear, + .remote_enable =3D tnt4882_remote_enable, + .enable_eos =3D tnt4882_enable_eos, + .disable_eos =3D tnt4882_disable_eos, + .parallel_poll =3D tnt4882_parallel_poll, + .parallel_poll_configure =3D tnt4882_parallel_poll_configure, + .parallel_poll_response =3D tnt4882_parallel_poll_response, + .local_parallel_poll_mode =3D NULL, // XXX + .line_status =3D tnt4882_line_status, + .update_status =3D tnt4882_update_status, + .primary_address =3D tnt4882_primary_address, + .secondary_address =3D tnt4882_secondary_address, + .serial_poll_response2 =3D tnt4882_serial_poll_response2, + .serial_poll_status =3D tnt4882_serial_poll_status, + .t1_delay =3D tnt4882_t1_delay, + .return_to_local =3D tnt4882_return_to_local, }; =20 -gpib_interface_t ni_isa_interface =3D { -name: "ni_isa", -attach : ni_tnt_isa_attach, -detach : ni_isa_detach, -read : tnt4882_accel_read, -write : tnt4882_accel_write, -command : tnt4882_command, -take_control : tnt4882_take_control, -go_to_standby : tnt4882_go_to_standby, -request_system_control : tnt4882_request_system_control, -interface_clear : tnt4882_interface_clear, -remote_enable : tnt4882_remote_enable, -enable_eos : tnt4882_enable_eos, -disable_eos : tnt4882_disable_eos, -parallel_poll : tnt4882_parallel_poll, -parallel_poll_configure : tnt4882_parallel_poll_configure, -parallel_poll_response : tnt4882_parallel_poll_response, -local_parallel_poll_mode : NULL, // XXX -line_status : tnt4882_line_status, -update_status : tnt4882_update_status, -primary_address : tnt4882_primary_address, -secondary_address : tnt4882_secondary_address, -serial_poll_response2 : tnt4882_serial_poll_response2, -serial_poll_status : tnt4882_serial_poll_status, -t1_delay : tnt4882_t1_delay, -return_to_local : tnt4882_return_to_local, +static gpib_interface_t ni_isa_interface =3D { + .name =3D "ni_isa", + .attach =3D ni_tnt_isa_attach, + .detach =3D ni_isa_detach, + .read =3D tnt4882_accel_read, + .write =3D tnt4882_accel_write, + .command =3D tnt4882_command, + .take_control =3D tnt4882_take_control, + .go_to_standby =3D tnt4882_go_to_standby, + .request_system_control =3D tnt4882_request_system_control, + .interface_clear =3D tnt4882_interface_clear, + .remote_enable =3D tnt4882_remote_enable, + .enable_eos =3D tnt4882_enable_eos, + .disable_eos =3D tnt4882_disable_eos, + .parallel_poll =3D tnt4882_parallel_poll, + .parallel_poll_configure =3D tnt4882_parallel_poll_configure, + .parallel_poll_response =3D tnt4882_parallel_poll_response, + .local_parallel_poll_mode =3D NULL, // XXX + .line_status =3D tnt4882_line_status, + .update_status =3D tnt4882_update_status, + .primary_address =3D tnt4882_primary_address, + .secondary_address =3D tnt4882_secondary_address, + .serial_poll_response2 =3D tnt4882_serial_poll_response2, + .serial_poll_status =3D tnt4882_serial_poll_status, + .t1_delay =3D tnt4882_t1_delay, + .return_to_local =3D tnt4882_return_to_local, }; =20 -gpib_interface_t ni_nat4882_isa_interface =3D { -name: "ni_nat4882_isa", -attach : ni_nat4882_isa_attach, -detach : ni_isa_detach, -read : tnt4882_read, -write : tnt4882_write, -command : tnt4882_command_unaccel, -take_control : tnt4882_take_control, -go_to_standby : tnt4882_go_to_standby, -request_system_control : tnt4882_request_system_control, -interface_clear : tnt4882_interface_clear, -remote_enable : tnt4882_remote_enable, -enable_eos : tnt4882_enable_eos, -disable_eos : tnt4882_disable_eos, -parallel_poll : tnt4882_parallel_poll, -parallel_poll_configure : tnt4882_parallel_poll_configure, -parallel_poll_response : tnt4882_parallel_poll_response, -local_parallel_poll_mode : NULL, // XXX -line_status : tnt4882_line_status, -update_status : tnt4882_update_status, -primary_address : tnt4882_primary_address, -secondary_address : tnt4882_secondary_address, -serial_poll_response2 : tnt4882_serial_poll_response2, -serial_poll_status : tnt4882_serial_poll_status, -t1_delay : tnt4882_t1_delay, -return_to_local : tnt4882_return_to_local, +static gpib_interface_t ni_nat4882_isa_interface =3D { + .name =3D "ni_nat4882_isa", + .attach =3D ni_nat4882_isa_attach, + .detach =3D ni_isa_detach, + .read =3D tnt4882_read, + .write =3D tnt4882_write, + .command =3D tnt4882_command_unaccel, + .take_control =3D tnt4882_take_control, + .go_to_standby =3D tnt4882_go_to_standby, + .request_system_control =3D tnt4882_request_system_control, + .interface_clear =3D tnt4882_interface_clear, + .remote_enable =3D tnt4882_remote_enable, + .enable_eos =3D tnt4882_enable_eos, + .disable_eos =3D tnt4882_disable_eos, + .parallel_poll =3D tnt4882_parallel_poll, + .parallel_poll_configure =3D tnt4882_parallel_poll_configure, + .parallel_poll_response =3D tnt4882_parallel_poll_response, + .local_parallel_poll_mode =3D NULL, // XXX + .line_status =3D tnt4882_line_status, + .update_status =3D tnt4882_update_status, + .primary_address =3D tnt4882_primary_address, + .secondary_address =3D tnt4882_secondary_address, + .serial_poll_response2 =3D tnt4882_serial_poll_response2, + .serial_poll_status =3D tnt4882_serial_poll_status, + .t1_delay =3D tnt4882_t1_delay, + .return_to_local =3D tnt4882_return_to_local, }; =20 -gpib_interface_t ni_nec_isa_interface =3D { -name: "ni_nec_isa", -attach : ni_nec_isa_attach, -detach : ni_isa_detach, -read : tnt4882_read, -write : tnt4882_write, -command : tnt4882_command_unaccel, -take_control : tnt4882_take_control, -go_to_standby : tnt4882_go_to_standby, -request_system_control : tnt4882_request_system_control, -interface_clear : tnt4882_interface_clear, -remote_enable : tnt4882_remote_enable, -enable_eos : tnt4882_enable_eos, -disable_eos : tnt4882_disable_eos, -parallel_poll : tnt4882_parallel_poll, -parallel_poll_configure : tnt4882_parallel_poll_configure, -parallel_poll_response : tnt4882_parallel_poll_response, -local_parallel_poll_mode : NULL, // XXX -line_status : NULL, -update_status : tnt4882_update_status, -primary_address : tnt4882_primary_address, -secondary_address : tnt4882_secondary_address, -serial_poll_response : tnt4882_serial_poll_response, -serial_poll_status : tnt4882_serial_poll_status, -t1_delay : tnt4882_t1_delay, -return_to_local : tnt4882_return_to_local, +static gpib_interface_t ni_nec_isa_interface =3D { + .name =3D "ni_nec_isa", + .attach =3D ni_nec_isa_attach, + .detach =3D ni_isa_detach, + .read =3D tnt4882_read, + .write =3D tnt4882_write, + .command =3D tnt4882_command_unaccel, + .take_control =3D tnt4882_take_control, + .go_to_standby =3D tnt4882_go_to_standby, + .request_system_control =3D tnt4882_request_system_control, + .interface_clear =3D tnt4882_interface_clear, + .remote_enable =3D tnt4882_remote_enable, + .enable_eos =3D tnt4882_enable_eos, + .disable_eos =3D tnt4882_disable_eos, + .parallel_poll =3D tnt4882_parallel_poll, + .parallel_poll_configure =3D tnt4882_parallel_poll_configure, + .parallel_poll_response =3D tnt4882_parallel_poll_response, + .local_parallel_poll_mode =3D NULL, // XXX + .line_status =3D NULL, + .update_status =3D tnt4882_update_status, + .primary_address =3D tnt4882_primary_address, + .secondary_address =3D tnt4882_secondary_address, + .serial_poll_response =3D tnt4882_serial_poll_response, + .serial_poll_status =3D tnt4882_serial_poll_status, + .t1_delay =3D tnt4882_t1_delay, + .return_to_local =3D tnt4882_return_to_local, }; =20 -gpib_interface_t ni_isa_accel_interface =3D { -name: "ni_isa_accel", -attach : ni_tnt_isa_attach, -detach : ni_isa_detach, -read : tnt4882_accel_read, -write : tnt4882_accel_write, -command : tnt4882_command, -take_control : tnt4882_take_control, -go_to_standby : tnt4882_go_to_standby, -request_system_control : tnt4882_request_system_control, -interface_clear : tnt4882_interface_clear, -remote_enable : tnt4882_remote_enable, -enable_eos : tnt4882_enable_eos, -disable_eos : tnt4882_disable_eos, -parallel_poll : tnt4882_parallel_poll, -parallel_poll_configure : tnt4882_parallel_poll_configure, -parallel_poll_response : tnt4882_parallel_poll_response, -local_parallel_poll_mode : NULL, // XXX -line_status : tnt4882_line_status, -update_status : tnt4882_update_status, -primary_address : tnt4882_primary_address, -secondary_address : tnt4882_secondary_address, -serial_poll_response2 : tnt4882_serial_poll_response2, -serial_poll_status : tnt4882_serial_poll_status, -t1_delay : tnt4882_t1_delay, -return_to_local : tnt4882_return_to_local, +static gpib_interface_t ni_isa_accel_interface =3D { + .name =3D "ni_isa_accel", + .attach =3D ni_tnt_isa_attach, + .detach =3D ni_isa_detach, + .read =3D tnt4882_accel_read, + .write =3D tnt4882_accel_write, + .command =3D tnt4882_command, + .take_control =3D tnt4882_take_control, + .go_to_standby =3D tnt4882_go_to_standby, + .request_system_control =3D tnt4882_request_system_control, + .interface_clear =3D tnt4882_interface_clear, + .remote_enable =3D tnt4882_remote_enable, + .enable_eos =3D tnt4882_enable_eos, + .disable_eos =3D tnt4882_disable_eos, + .parallel_poll =3D tnt4882_parallel_poll, + .parallel_poll_configure =3D tnt4882_parallel_poll_configure, + .parallel_poll_response =3D tnt4882_parallel_poll_response, + .local_parallel_poll_mode =3D NULL, // XXX + .line_status =3D tnt4882_line_status, + .update_status =3D tnt4882_update_status, + .primary_address =3D tnt4882_primary_address, + .secondary_address =3D tnt4882_secondary_address, + .serial_poll_response2 =3D tnt4882_serial_poll_response2, + .serial_poll_status =3D tnt4882_serial_poll_status, + .t1_delay =3D tnt4882_t1_delay, + .return_to_local =3D tnt4882_return_to_local, }; =20 -gpib_interface_t ni_nat4882_isa_accel_interface =3D { -name: "ni_nat4882_isa_accel", -attach : ni_nat4882_isa_attach, -detach : ni_isa_detach, -read : tnt4882_accel_read, -write : tnt4882_accel_write, -command : tnt4882_command_unaccel, -take_control : tnt4882_take_control, -go_to_standby : tnt4882_go_to_standby, -request_system_control : tnt4882_request_system_control, -interface_clear : tnt4882_interface_clear, -remote_enable : tnt4882_remote_enable, -enable_eos : tnt4882_enable_eos, -disable_eos : tnt4882_disable_eos, -parallel_poll : tnt4882_parallel_poll, -parallel_poll_configure : tnt4882_parallel_poll_configure, -parallel_poll_response : tnt4882_parallel_poll_response, -local_parallel_poll_mode : NULL, // XXX -line_status : tnt4882_line_status, -update_status : tnt4882_update_status, -primary_address : tnt4882_primary_address, -secondary_address : tnt4882_secondary_address, -serial_poll_response2 : tnt4882_serial_poll_response2, -serial_poll_status : tnt4882_serial_poll_status, -t1_delay : tnt4882_t1_delay, -return_to_local : tnt4882_return_to_local, +static gpib_interface_t ni_nat4882_isa_accel_interface =3D { + .name =3D "ni_nat4882_isa_accel", + .attach =3D ni_nat4882_isa_attach, + .detach =3D ni_isa_detach, + .read =3D tnt4882_accel_read, + .write =3D tnt4882_accel_write, + .command =3D tnt4882_command_unaccel, + .take_control =3D tnt4882_take_control, + .go_to_standby =3D tnt4882_go_to_standby, + .request_system_control =3D tnt4882_request_system_control, + .interface_clear =3D tnt4882_interface_clear, + .remote_enable =3D tnt4882_remote_enable, + .enable_eos =3D tnt4882_enable_eos, + .disable_eos =3D tnt4882_disable_eos, + .parallel_poll =3D tnt4882_parallel_poll, + .parallel_poll_configure =3D tnt4882_parallel_poll_configure, + .parallel_poll_response =3D tnt4882_parallel_poll_response, + .local_parallel_poll_mode =3D NULL, // XXX + .line_status =3D tnt4882_line_status, + .update_status =3D tnt4882_update_status, + .primary_address =3D tnt4882_primary_address, + .secondary_address =3D tnt4882_secondary_address, + .serial_poll_response2 =3D tnt4882_serial_poll_response2, + .serial_poll_status =3D tnt4882_serial_poll_status, + .t1_delay =3D tnt4882_t1_delay, + .return_to_local =3D tnt4882_return_to_local, }; =20 -gpib_interface_t ni_nec_isa_accel_interface =3D { -name: "ni_nec_isa_accel", -attach : ni_nec_isa_attach, -detach : ni_isa_detach, -read : tnt4882_accel_read, -write : tnt4882_accel_write, -command : tnt4882_command_unaccel, -take_control : tnt4882_take_control, -go_to_standby : tnt4882_go_to_standby, -request_system_control : tnt4882_request_system_control, -interface_clear : tnt4882_interface_clear, -remote_enable : tnt4882_remote_enable, -enable_eos : tnt4882_enable_eos, -disable_eos : tnt4882_disable_eos, -parallel_poll : tnt4882_parallel_poll, -parallel_poll_configure : tnt4882_parallel_poll_configure, -parallel_poll_response : tnt4882_parallel_poll_response, -local_parallel_poll_mode : NULL, // XXX -line_status : NULL, -update_status : tnt4882_update_status, -primary_address : tnt4882_primary_address, -secondary_address : tnt4882_secondary_address, -serial_poll_response : tnt4882_serial_poll_response, -serial_poll_status : tnt4882_serial_poll_status, -t1_delay : tnt4882_t1_delay, -return_to_local : tnt4882_return_to_local, +static gpib_interface_t ni_nec_isa_accel_interface =3D { + .name =3D "ni_nec_isa_accel", + .attach =3D ni_nec_isa_attach, + .detach =3D ni_isa_detach, + .read =3D tnt4882_accel_read, + .write =3D tnt4882_accel_write, + .command =3D tnt4882_command_unaccel, + .take_control =3D tnt4882_take_control, + .go_to_standby =3D tnt4882_go_to_standby, + .request_system_control =3D tnt4882_request_system_control, + .interface_clear =3D tnt4882_interface_clear, + .remote_enable =3D tnt4882_remote_enable, + .enable_eos =3D tnt4882_enable_eos, + .disable_eos =3D tnt4882_disable_eos, + .parallel_poll =3D tnt4882_parallel_poll, + .parallel_poll_configure =3D tnt4882_parallel_poll_configure, + .parallel_poll_response =3D tnt4882_parallel_poll_response, + .local_parallel_poll_mode =3D NULL, // XXX + .line_status =3D NULL, + .update_status =3D tnt4882_update_status, + .primary_address =3D tnt4882_primary_address, + .secondary_address =3D tnt4882_secondary_address, + .serial_poll_response =3D tnt4882_serial_poll_response, + .serial_poll_status =3D tnt4882_serial_poll_status, + .t1_delay =3D tnt4882_t1_delay, + .return_to_local =3D tnt4882_return_to_local, }; =20 #ifdef GPIB_PCMCIA -gpib_interface_t ni_pcmcia_interface =3D { -name: "ni_pcmcia", -attach : ni_pcmcia_attach, -detach : ni_pcmcia_detach, -read : tnt4882_accel_read, -write : tnt4882_accel_write, -command : tnt4882_command, -take_control : tnt4882_take_control, -go_to_standby : tnt4882_go_to_standby, -request_system_control : tnt4882_request_system_control, -interface_clear : tnt4882_interface_clear, -remote_enable : tnt4882_remote_enable, -enable_eos : tnt4882_enable_eos, -disable_eos : tnt4882_disable_eos, -parallel_poll : tnt4882_parallel_poll, -parallel_poll_configure : tnt4882_parallel_poll_configure, -parallel_poll_response : tnt4882_parallel_poll_response, -local_parallel_poll_mode : NULL, // XXX -line_status : tnt4882_line_status, -update_status : tnt4882_update_status, -primary_address : tnt4882_primary_address, -secondary_address : tnt4882_secondary_address, -serial_poll_response : tnt4882_serial_poll_response, -serial_poll_status : tnt4882_serial_poll_status, -t1_delay : tnt4882_t1_delay, -return_to_local : tnt4882_return_to_local, +static gpib_interface_t ni_pcmcia_interface =3D { + .name =3D "ni_pcmcia", + .attach =3D ni_pcmcia_attach, + .detach =3D ni_pcmcia_detach, + .read =3D tnt4882_accel_read, + .write =3D tnt4882_accel_write, + .command =3D tnt4882_command, + .take_control =3D tnt4882_take_control, + .go_to_standby =3D tnt4882_go_to_standby, + .request_system_control =3D tnt4882_request_system_control, + .interface_clear =3D tnt4882_interface_clear, + .remote_enable =3D tnt4882_remote_enable, + .enable_eos =3D tnt4882_enable_eos, + .disable_eos =3D tnt4882_disable_eos, + .parallel_poll =3D tnt4882_parallel_poll, + .parallel_poll_configure =3D tnt4882_parallel_poll_configure, + .parallel_poll_response =3D tnt4882_parallel_poll_response, + .local_parallel_poll_mode =3D NULL, // XXX + .line_status =3D tnt4882_line_status, + .update_status =3D tnt4882_update_status, + .primary_address =3D tnt4882_primary_address, + .secondary_address =3D tnt4882_secondary_address, + .serial_poll_response =3D tnt4882_serial_poll_response, + .serial_poll_status =3D tnt4882_serial_poll_status, + .t1_delay =3D tnt4882_t1_delay, + .return_to_local =3D tnt4882_return_to_local, }; =20 -gpib_interface_t ni_pcmcia_accel_interface =3D { -name: "ni_pcmcia_accel", -attach : ni_pcmcia_attach, -detach : ni_pcmcia_detach, -read : tnt4882_accel_read, -write : tnt4882_accel_write, -command : tnt4882_command, -take_control : tnt4882_take_control, -go_to_standby : tnt4882_go_to_standby, -request_system_control : tnt4882_request_system_control, -interface_clear : tnt4882_interface_clear, -remote_enable : tnt4882_remote_enable, -enable_eos : tnt4882_enable_eos, -disable_eos : tnt4882_disable_eos, -parallel_poll : tnt4882_parallel_poll, -parallel_poll_configure : tnt4882_parallel_poll_configure, -parallel_poll_response : tnt4882_parallel_poll_response, -local_parallel_poll_mode : NULL, // XXX -line_status : tnt4882_line_status, -update_status : tnt4882_update_status, -primary_address : tnt4882_primary_address, -secondary_address : tnt4882_secondary_address, -serial_poll_response : tnt4882_serial_poll_response, -serial_poll_status : tnt4882_serial_poll_status, -t1_delay : tnt4882_t1_delay, -return_to_local : tnt4882_return_to_local, +static gpib_interface_t ni_pcmcia_accel_interface =3D { + .name =3D "ni_pcmcia_accel", + .attach =3D ni_pcmcia_attach, + .detach =3D ni_pcmcia_detach, + .read =3D tnt4882_accel_read, + .write =3D tnt4882_accel_write, + .command =3D tnt4882_command, + .take_control =3D tnt4882_take_control, + .go_to_standby =3D tnt4882_go_to_standby, + .request_system_control =3D tnt4882_request_system_control, + .interface_clear =3D tnt4882_interface_clear, + .remote_enable =3D tnt4882_remote_enable, + .enable_eos =3D tnt4882_enable_eos, + .disable_eos =3D tnt4882_disable_eos, + .parallel_poll =3D tnt4882_parallel_poll, + .parallel_poll_configure =3D tnt4882_parallel_poll_configure, + .parallel_poll_response =3D tnt4882_parallel_poll_response, + .local_parallel_poll_mode =3D NULL, // XXX + .line_status =3D tnt4882_line_status, + .update_status =3D tnt4882_update_status, + .primary_address =3D tnt4882_primary_address, + .secondary_address =3D tnt4882_secondary_address, + .serial_poll_response =3D tnt4882_serial_poll_response, + .serial_poll_status =3D tnt4882_serial_poll_status, + .t1_delay =3D tnt4882_t1_delay, + .return_to_local =3D tnt4882_return_to_local, }; #endif =20 --=20 2.47.1