From patchwork Fri Jun 23 17:18:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 780181 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3wvQCW5PWKz9sxR for ; Sat, 24 Jun 2017 03:18:47 +1000 (AEST) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3wvQCW4ZthzDqpl for ; Sat, 24 Jun 2017 03:18:47 +1000 (AEST) X-Original-To: slof@lists.ozlabs.org Delivered-To: slof@lists.ozlabs.org Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3wvQCN2J2qzDqjM for ; Sat, 24 Jun 2017 03:18:40 +1000 (AEST) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 64CB630AF70; Fri, 23 Jun 2017 17:18:38 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 64CB630AF70 Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=thuth@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 64CB630AF70 Received: from thh440s.redhat.com (ovpn-116-135.ams2.redhat.com [10.36.116.135]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7EDF782BCB; Fri, 23 Jun 2017 17:18:37 +0000 (UTC) From: Thomas Huth To: slof@lists.ozlabs.org Date: Fri, 23 Jun 2017 19:18:33 +0200 Message-Id: <1498238315-17909-2-git-send-email-thuth@redhat.com> In-Reply-To: <1498238315-17909-1-git-send-email-thuth@redhat.com> References: <1498238315-17909-1-git-send-email-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Fri, 23 Jun 2017 17:18:38 +0000 (UTC) Subject: [SLOF] [PATCH 1/3] libnet: Remove remainders of netsave code X-BeenThere: slof@lists.ozlabs.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "Patches for https://github.com/aik/SLOF" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: slof-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "SLOF" The code does not exist in the repository, so it does not make sense to keep the prototypes and the Forth wrapper around. Signed-off-by: Thomas Huth --- lib/libnet/netapps.h | 1 - lib/libnet/tftp.h | 2 -- slof/fs/loaders.fs | 10 ---------- 3 files changed, 13 deletions(-) diff --git a/lib/libnet/netapps.h b/lib/libnet/netapps.h index 91c1ebd..2fea4a7 100644 --- a/lib/libnet/netapps.h +++ b/lib/libnet/netapps.h @@ -20,7 +20,6 @@ struct filename_ip; extern int netload(char *buffer, int len, char *ret_buffer, int huge_load, int block_size, char *args_fs, int alen); -extern int netsave(int argc, char *argv[]); extern int ping(char *args_fs, int alen); extern int dhcp(char *ret_buffer, struct filename_ip *fn_ip, unsigned int retries, int flags); diff --git a/lib/libnet/tftp.h b/lib/libnet/tftp.h index 303feaf..b1dbc21 100644 --- a/lib/libnet/tftp.h +++ b/lib/libnet/tftp.h @@ -42,8 +42,6 @@ typedef struct { int tftp(filename_ip_t *, unsigned char *, int, unsigned int, tftp_err_t *, int32_t mode, int32_t blocksize, int ip_version); -int tftp_netsave(filename_ip_t *, uint8_t * buffer, int len, - int use_ci, unsigned int retries, tftp_err_t * tftp_err); int32_t handle_tftp(int fd, uint8_t *, int32_t); void handle_tftp_dun(uint8_t err_code); diff --git a/slof/fs/loaders.fs b/slof/fs/loaders.fs index 8ae502d..9d18462 100644 --- a/slof/fs/loaders.fs +++ b/slof/fs/loaders.fs @@ -60,16 +60,6 @@ CREATE load-list 2 cells allot load-list 2 cells erase : .client-exec ( arg len -- rc ) set-bootargs (client-exec) ; ' .client-exec to client-exec -: netsave ( "addr len {filename}[,params]" -- rc ) - (parse-line) dup 0> IF - s" netsave " 2swap $cat set-netbootpath client-exec - ELSE - cr - ." Usage: netsave addr len [bootp|dhcp,]filename[,siaddr][,ciaddr][,giaddr][,bootp-retries][,tftp-retries][,use_ci]" - cr 2drop - THEN -; - : ping ( "{device-path:[device-args,]server-ip,[client-ip[\nn]],[gateway-ip][,timeout]}" -- ) my-self >r current-node @ >r \ Save my-self (parse-line) open-dev dup IF