From b13808f240a23b26583fc6bc6aa3eb3e74dc3393 Mon Sep 17 00:00:00 2001 From: Henryk Richter Date: Thu, 14 Jun 2018 08:20:30 +0200 Subject: [PATCH 1/2] Updated LAN driver - changed directory layout - Multicast support (automatic RX filter adjustment) - MC68000 target in Makefile - clarified licensing (GPLv3) - README files --- Driver/baxnet/Common.mk.sd | 172 ----- Driver/baxnet/GPL | 620 ++++++++++++++++++ Driver/baxnet/README | 17 + Driver/baxnet/README.enc | 118 ++++ Driver/baxnet/{sdnet/README => README.sdnet} | 65 +- Driver/baxnet/bin/enc624j6net.device | Bin 0 -> 11572 bytes .../baxnet/{ => bin}/enc624j6net.device_68000 | Bin 12084 -> 12192 bytes Driver/baxnet/bin/sdnet.device | Bin 0 -> 13296 bytes Driver/baxnet/bin/v2expeth.device | Bin 0 -> 13300 bytes Driver/baxnet/devinit.c | 92 --- Driver/baxnet/rewrite.txt | 8 - Driver/baxnet/{ => source}/Common.mk | 21 +- Driver/baxnet/{ => source}/Makefile.enc | 18 +- Driver/baxnet/{ => source}/Makefile.sdnet | 3 +- Driver/baxnet/{ => source}/compiler.h | 5 +- Driver/baxnet/{ => source}/debug.h | 0 Driver/baxnet/{ => source}/device.c | 0 Driver/baxnet/{ => source}/device.h | 0 Driver/baxnet/{ => source}/deviceheader.c | 8 +- Driver/baxnet/{ => source}/deviceinit.c | 16 +- Driver/baxnet/{ => source}/enc624j6net.device | Bin 11476 -> 11484 bytes .../{ => source}/enc624j6net/enc624j6l.asm | 52 +- .../{ => source}/enc624j6net/enc624j6l.h | 13 + Driver/baxnet/{ => source}/enc624j6net/hw.c | 18 +- .../{ => source}/enc624j6net/hwprivate.h | 0 .../enc624j6net/intervaltimer.asm | 0 .../{ => source}/enc624j6net/intervaltimer.h | 0 .../{ => source}/enc624j6net/intervaltimer.i | 0 .../baxnet/{ => source}/enc624j6net/macros.i | 0 .../{ => source}/enc624j6net/registers.h | 0 .../{ => source}/enc624j6net/registers.i | 0 Driver/baxnet/{ => source}/hw.h | 0 Driver/baxnet/{ => source}/macros.h | 0 Driver/baxnet/{ => source}/sdnet/enc28j60.c | 0 Driver/baxnet/{ => source}/sdnet/enc28j60.h | 0 .../baxnet/{ => source}/sdnet/enc28j60l.asm | 158 +---- Driver/baxnet/{ => source}/sdnet/enc28j60l.h | 0 Driver/baxnet/{ => source}/sdnet/hw.c | 0 Driver/baxnet/{ => source}/sdnet/hwprivate.h | 0 .../{ => source}/sdnet/intervaltimer.asm | 0 .../baxnet/{ => source}/sdnet/intervaltimer.h | 0 .../baxnet/{ => source}/sdnet/intervaltimer.i | 0 Driver/baxnet/{ => source}/sdnet/vampuuid.asm | 0 Driver/baxnet/{ => source}/sdnet/vampuuid.h | 0 Driver/baxnet/{ => source}/server.c | 0 Driver/baxnet/{ => source}/server.h | 0 46 files changed, 919 insertions(+), 485 deletions(-) delete mode 100644 Driver/baxnet/Common.mk.sd create mode 100644 Driver/baxnet/GPL create mode 100644 Driver/baxnet/README create mode 100644 Driver/baxnet/README.enc rename Driver/baxnet/{sdnet/README => README.sdnet} (78%) create mode 100755 Driver/baxnet/bin/enc624j6net.device rename Driver/baxnet/{ => bin}/enc624j6net.device_68000 (62%) mode change 100644 => 100755 create mode 100755 Driver/baxnet/bin/sdnet.device create mode 100755 Driver/baxnet/bin/v2expeth.device delete mode 100644 Driver/baxnet/devinit.c delete mode 100644 Driver/baxnet/rewrite.txt rename Driver/baxnet/{ => source}/Common.mk (90%) rename Driver/baxnet/{ => source}/Makefile.enc (67%) rename Driver/baxnet/{ => source}/Makefile.sdnet (98%) rename Driver/baxnet/{ => source}/compiler.h (94%) rename Driver/baxnet/{ => source}/debug.h (100%) rename Driver/baxnet/{ => source}/device.c (100%) rename Driver/baxnet/{ => source}/device.h (100%) rename Driver/baxnet/{ => source}/deviceheader.c (87%) rename Driver/baxnet/{ => source}/deviceinit.c (66%) rename Driver/baxnet/{ => source}/enc624j6net.device (85%) mode change 100644 => 100755 rename Driver/baxnet/{ => source}/enc624j6net/enc624j6l.asm (98%) mode change 100644 => 100755 rename Driver/baxnet/{ => source}/enc624j6net/enc624j6l.h (96%) rename Driver/baxnet/{ => source}/enc624j6net/hw.c (95%) rename Driver/baxnet/{ => source}/enc624j6net/hwprivate.h (100%) rename Driver/baxnet/{ => source}/enc624j6net/intervaltimer.asm (100%) rename Driver/baxnet/{ => source}/enc624j6net/intervaltimer.h (100%) rename Driver/baxnet/{ => source}/enc624j6net/intervaltimer.i (100%) rename Driver/baxnet/{ => source}/enc624j6net/macros.i (100%) rename Driver/baxnet/{ => source}/enc624j6net/registers.h (100%) rename Driver/baxnet/{ => source}/enc624j6net/registers.i (100%) rename Driver/baxnet/{ => source}/hw.h (100%) rename Driver/baxnet/{ => source}/macros.h (100%) rename Driver/baxnet/{ => source}/sdnet/enc28j60.c (100%) rename Driver/baxnet/{ => source}/sdnet/enc28j60.h (100%) rename Driver/baxnet/{ => source}/sdnet/enc28j60l.asm (89%) mode change 100644 => 100755 rename Driver/baxnet/{ => source}/sdnet/enc28j60l.h (100%) mode change 100644 => 100755 rename Driver/baxnet/{ => source}/sdnet/hw.c (100%) rename Driver/baxnet/{ => source}/sdnet/hwprivate.h (100%) rename Driver/baxnet/{ => source}/sdnet/intervaltimer.asm (100%) rename Driver/baxnet/{ => source}/sdnet/intervaltimer.h (100%) rename Driver/baxnet/{ => source}/sdnet/intervaltimer.i (100%) rename Driver/baxnet/{ => source}/sdnet/vampuuid.asm (100%) rename Driver/baxnet/{ => source}/sdnet/vampuuid.h (100%) mode change 100644 => 100755 rename Driver/baxnet/{ => source}/server.c (100%) rename Driver/baxnet/{ => source}/server.h (100%) diff --git a/Driver/baxnet/Common.mk.sd b/Driver/baxnet/Common.mk.sd deleted file mode 100644 index 6945cca..0000000 --- a/Driver/baxnet/Common.mk.sd +++ /dev/null @@ -1,172 +0,0 @@ -############################################################################### -# -# Common.mk -# -# author: Henryk Richter -# -# note: when switching between different hardware targets, don`t forget -# "make clean" in between -# -# tools required: -# GNU Make, either VBCC or GCC for AmigaOS/68k, VASM -# recent sana2.h , e.g. from RoadShow SDK -# -# porting: -# you might need to adapt the paths (prefix for Compiler/Includes) -# Some installations have ADE: instead of GG: on Amigaos -# Recent work on AmigaOS cross toolchains suggest /opt/m68k-amigaos/sys-include -# instead of the traditional os-include -# -############################################################################### -debug = 0 -compiler_vcc = 1 - -############################################################################### -# prefix for system includes (ASM) -# -############################################################################### -PREFX = /opt/amigaos-68k/ -PREFX = gg: -SYSINC = $(PREFX)os-include - -############################################################################### -# -# compiler executables (choice of gcc or vbcc) -# -############################################################################### -ifeq ($(compiler_vcc),1) - -# VBCC (use explicit vlink line for LINK= if complaints about R_PC happen) -CCX = vc -LINK = vlink -bamigahunk -x -s -mrel -Cvbcc -Bstatic -nostdlib #-Rshort -#LINK = $(CCX) -nostdlib -CFLAGS = -Os -+ -sc -c99 -cpu=68020 - -else - -# GCC -CCX = m68k-amigaos-gcc -LINK = $(CCX) -nostartfiles -s -CFLAGS = -O3 -s -m68060 -Wall -noixemul -mregparm=4 -fomit-frame-pointer -msoft-float -noixemul - -endif - -VASM = vasmm68k_mot -VASMFORMAT = -m68020 -Fhunk -nowarn=2064 -quiet -I$(SYSINC) - -# unused here -#HOST = $(shell uname) - -############################################################################### -# -# paths to the local includes -# -############################################################################### - -IPATH = - -############################################################################### -# -# compile-level feature definitions -# -############################################################################### -ifeq ($(compiler_vcc),1) - -DEFINES += -DDEVICEVERSION=$(DEVICEVERSION) -DDEVICEREVISION=$(DEVICEREVISION) -DEFINES += -DDEVICEDATE=$(DEVICEDATE) -DDEVICENAME="$(DEVICEID)" -DEFINES += -DDEVICEEXTRA=$(DEVICEEXTRA) -ASMDEFS += -DDEVICEVERSION=$(DEVICEVERSION) -DDEVICEREVISION=$(DEVICEREVISION) -#ASMDEFS += -DDEVICEDATE=$(DEVICEDATE) -DDEVICENAME=$(DEVICEID) - -DEFINES2 += -DDEVICEVERSION=$(DEVICEVERSION) -DDEVICEREVISION=$(DEVICEREVISION) -DEFINES2 += -DDEVICEDATE=$(DEVICEDATE) -DDEVICENAME="$(DEVICEID2)" -DEFINES2 += -DDEVICEEXTRA=$(DEVICEEXTRA) -ASMDEFS2 += -DDEVICEVERSION=$(DEVICEVERSION) -DDEVICEREVISION=$(DEVICEREVISION) - -else - -DEFINES += -D"DEVICEVERSION=$(DEVICEVERSION)" -D"DEVICEREVISION=$(DEVICEREVISION)" -DEFINES += -D"DEVICEDATE=$(DEVICEDATE)" -D"DEVICENAME="$(DEVICEID)"" -DEFINES += -D"DEVICEEXTRA=$(DEVICEEXTRA)" -ASMDEFS += -DDEVICEVERSION=$(DEVICEVERSION) -DDEVICEREVISION=$(DEVICEREVISION) -#ASMDEFS += -DDEVICEDATE=$(DEVICEDATE) -DDEVICENAME=$(DEVICEID) - -DEFINES2 += -D"DEVICEVERSION=$(DEVICEVERSION)" -D"DEVICEREVISION=$(DEVICEREVISION)" -DEFINES2 += -D"DEVICEDATE=$(DEVICEDATE)" -D"DEVICENAME="$(DEVICEID2)"" -DEFINES2 += -D"DEVICEEXTRA=$(DEVICEEXTRA)" -ASMDEFS2 += -DDEVICEVERSION=$(DEVICEVERSION) -DDEVICEREVISION=$(DEVICEREVISION) - -endif - -############################################################################### -# -# debug -# -############################################################################### -ifeq ($(debug),1) -CFLAGS += -DDEBUG -g -LINKLIBS = -L$(PREFX)/lib -ldebug -endif - -############################################################################### -# -# compiler flags and optimization levels -# -############################################################################### - -CFLAGS += -I. -CFLAGS += -I$(SUBDIR) -LDFLAGS = - -############################################################################### -# -# objects to build -# -############################################################################### -# ASM based alternative to deviceheader.o would be romtag.o - -OBJECTS = deviceheader.o deviceinit.o device.o server.o $(SUBDIR)/hw.o -OBJECTS += $(ASMOBJECTS) - -# used for secondary build -OBJECTS2 = $(patsubst %.o,%.2o,$(OBJECTS)) - -############################################################################### -# -# rules and commands -# -############################################################################### - -all: $(DEVICEID) $(DEVICEID2) - -clean: - rm -f $(OBJECTS) $(OBJECTS2) - rm -f $(DEVICEID) $(DEVICEID2) - -#sdnet: $(DEVICEID) -#expnet: $(DEVICEID2) - -$(DEVICEID) : $(OBJECTS) - $(LINK) $(LDFLAGS) -o $@ $(OBJECTS) $(LINKLIBS) $(LINKOPTS) - - -# separate ruleset for each subdirectory, ./src overrides all other paths for priority -# of platform-optimized routines -%.o : %.c - $(CCX) -c $(CFLAGS) $(DEFINES) $(IPATH) $< -o $@ - -%.o : %.asm - ${VASM} $(VASMFORMAT) $(ASMDEFS) -o $@ $< - - -# secondary ruleset (used for expnet, will be ignored if DEVICEID2 is empty) -$(DEVICEID2) : $(OBJECTS2) - $(LINK) $(LDFLAGS) -o $@ $(OBJECTS2) $(LINKLIBS) - -%.2o : %.c - $(CCX) -c $(CFLAGS) $(DEFINES2) $(IPATH) $< -o $@ - -%.2o : %.asm - ${VASM} $(VASMFORMAT) $(ASMDEFS2) -o $@ $< - - diff --git a/Driver/baxnet/GPL b/Driver/baxnet/GPL new file mode 100644 index 0000000..6a34f51 --- /dev/null +++ b/Driver/baxnet/GPL @@ -0,0 +1,620 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + diff --git a/Driver/baxnet/README b/Driver/baxnet/README new file mode 100644 index 0000000..82ff4cc --- /dev/null +++ b/Driver/baxnet/README @@ -0,0 +1,17 @@ +Short: V2.00, SANA-II network drivers for several adapters +Author: Henryk Richter +Uploader: henryk.richter@gmx.net +Type: driver/net +Architecture: m68k-amigaos +Requires: OS 2.04+ + +This package contains network drivers for the following hardware: +- ZII LAN IDE CP (matze, scrat and buggs @a1k.org) + OSS Zorro-II card with ENC624J600 ethernet controller, autoboot + IDE and Clockport +- Vampire500/600 with ENC28J60 module connected to the SD-card slot +- Vampire500V2+ with ENC28J60 module connected to the expansion port + +Full source code is included (GPL). Please refer to README.sdnet and +README.enc for installation and operation instructions + diff --git a/Driver/baxnet/README.enc b/Driver/baxnet/README.enc new file mode 100644 index 0000000..67d0e0d --- /dev/null +++ b/Driver/baxnet/README.enc @@ -0,0 +1,118 @@ +ENC624J6Net - A SANA-II driver for the Scratze card + +ENC624J6Net Copyright (C) 2018 Henryk Richter + +This driver is supposed to support ENC624J600 based ethernet +on the ZII LAN IDE CP card designed by Matze (a1k.org) and Scrat (a1k.org). + +Please see at the end of the file for information about licensing +conditions. + + +Installation: +------------- + +Installation of the driver is straightforward. +Just copy the enc624j6net.device to devs:networks and enable +the interface in your favorite TCP/IP stack as usual. There is a version +for MC68020 or later (enc624j6net.device) and another version for +68000 (enc624j6net.device_68000). Choose the right one. + +So far, successful tests have been done with the free AmiTCP/IP 3.0b2, +AmiTCP4.0-4.2, Genesis, MiamiDX and RoadShow. + +The Zorro board itself should be visible in early startup with manufacturer +ID 2588 and card ID 123. + + + +Configuration options +--------------------- + +No special configuration of the driver is necessary for normal operation. +The configuration options outlined below are documented for tuning purposes. + +The config to be placed in ENVARC:sana2/enc624j6net.config and consists +of a single line with parameters (much like CLI parameters). + +PRIORITY=PRI/K/N,BPS/K/N,MTU/K/N,FULLDUPLEX/S,FLOWCONTROL/S,TIMER/K/N,MULTICAST/S + + FULLDUPLEX - change Ethernet module into full duplex mode, + caution: requires manual configuration of duplex mode + on the switch, too. + note: this switch should not be enabled in normal cases. + The module feeatures autoconfiguration that determines + speed and duplex automatically. + + PRIORITY - server task priority (default 1) + + BPS - bit per seconds for statistics purposes + + MTU - maximum transmission unit (default 1500) + + MULTICAST - obsolete, kept for config file backwards compatibility with + old driver + + FLOWCONTROL - enable automatic flow control that throttles incoming + data when the hardware buffer gets full + + example (useful for DSL via PPPoE with AmiTCP): + echo "MTU=1492 PRIORITY=6" >ENVARC:sana2/enc624j6net.config + + +Changelog: +---------- + +1.91 - first Beta of completely rewritten driver + - support for concurrent IP stacks + - faster handling of statistics + - multiple board support where applicable + - workaround for Shapeshifter network plugin bug + - GCC or VBCC as compiler (cross or native compilation) + - faster lowlevel read/write + + +Compilation / Development Notes +------------------------------- + +Either VBCC or GCC (tested with version 2.95 only) can be used. General +options for compiler usage can be found in Common.mk. Also, you might want +to adapt the paths to your setup (PREFX,SYSINC). In addition to the regular +NDK, the sana2.h is expected in the devices/ subdir of the includes. sana2.h +may be found in the AmiTCP or Roadshow SDK, respectively. + +Call + + make -f Makefile.enc + +for building the device. + +VBCC note: When calling the GNU Make port supplied with ADE/GG natively on AmigaOS3, +please make sure that "vc" is within the search path of "/bin/sh". + +Conceptually, the driver was meant to support multiple hardware targets. Therefore, +it features a SANA-II frontend (device.c,deviceheader.c,deviceinit.c), a main +server running in a task (server.c) and several hardware backends. A new hardware +backend requires customized implementation of hw.c and hwprivate.h, along with +additional hardware-specfic code, if needed. The device unit structure reserves +three LONGS and three pointers for exclusive use by the hardware instance. Additional +data for the hardware can be auto-allocated at device initialization time, if necessary. +See "struct HWData" in hwprivate.h of existing backends. + + +License: +-------- + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + diff --git a/Driver/baxnet/sdnet/README b/Driver/baxnet/README.sdnet similarity index 78% rename from Driver/baxnet/sdnet/README rename to Driver/baxnet/README.sdnet index 497e9b1..dd3bce8 100644 --- a/Driver/baxnet/sdnet/README +++ b/Driver/baxnet/README.sdnet @@ -1,6 +1,6 @@ SDNet - A SANA-II driver for ENC28J60 10BaseT ethernet modules -Written in 2016-2018 by Henryk Richter +Copyright (C) 2016-2018 Henryk Richter This driver is supposed to support ENC28J60 modules hooked up to the MicroSD slot of Vampire 500/600 cards or the expansion port of Vampire 500V2+ cards. @@ -226,22 +226,57 @@ Changelog: 0.3 - first version shared with the Apollo team -Copyrights: ------------ +Compilation / Development Notes +------------------------------- -The SDNet source is heavily based on plipbox, which is in turn based on the magPLIP -driver found on aminet.net: +Either VBCC or GCC (tested with version 2.95 only) can be used. General +options for compiler usage can be found in Common.mk. Also, you might want +to adapt the paths to your setup (PREFX,SYSINC). In addition to the regular +NDK, the sana2.h is expected in the devices/ subdir of the includes. sana2.h +may be found in the AmiTCP or Roadshow SDK, respectively. -http://lallafa.de/blog/amiga-projects/plipbox/ -http://aminet.net/package/comm/net/magPLIP38.1 +Call -magPLIP - SANA II compliant PLIP device driver for AmiTCP/IP, Envoy, - AS225 and other networking packages + make -f Makefile.sdnet + +for building the device. + +VBCC note: When calling the GNU Make port supplied with ADE/GG natively on AmigaOS3, +please make sure that "vc" is within the search path of "/bin/sh". + +Conceptually, the driver was meant to support multiple hardware targets. Therefore, +it features a SANA-II frontend (device.c,deviceheader.c,deviceinit.c), a main +server running in a task (server.c) and several hardware backends. A new hardware +backend requires customized implementation of hw.c and hwprivate.h, along with +additional hardware-specfic code, if needed. The device unit structure reserves +three LONGS and three pointers for exclusive use by the hardware instance. Additional +data for the hardware can be auto-allocated at device initialization time, if necessary. +See "struct HWData" in hwprivate.h of existing backends. + + +Copyrights / License: +--------------------- + +Up to version 1.03, the driver was heavily based on PlipBox, which is in turn based +on the magPLIP driver found on aminet.net. + +Versions 1.90Beta and beyond are the result of a complete rewrite. I felt that I couldn't +incorporate desired features and changes with a reasonable amount of work into the old +codebase. This resulting package is made available as free software and contributions are +welcome. + + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . - (C) Copyright 1993-1994 Oliver Wagner, Michael Balzer - (C) Copyright 1995 Jan Kratochvil & Martin Mares - (C) Copyright 1995-1996 Marius Groeger - All Rights Reserved. - Changes have been made by Stéphane Zermatten to the driver to connect - a LinuxBox to an Amiga via a LapLing cable, based on the release 37.8. diff --git a/Driver/baxnet/bin/enc624j6net.device b/Driver/baxnet/bin/enc624j6net.device new file mode 100755 index 0000000000000000000000000000000000000000..6a4cbdd63fde03de0ab9512758a3d4f845f5d899 GIT binary patch literal 11572 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 literal 0 HcmV?d00001 diff --git a/Driver/baxnet/bin/v2expeth.device b/Driver/baxnet/bin/v2expeth.device new file mode 100755 index 0000000000000000000000000000000000000000..051df561d296140b1fbac492f98385e0dbfde828 GIT binary patch literal 13300 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 tgVD}t - - taken from commandline (compiler options) - -DDEVICENAME=blah.device - -DDEVICEVERSION=45 - -DDEVICEREVISION=36 - -DDEVICEDATE=2.12.2012 - -*/ - -#include -#include -#include -#include -#include "compiler.h" -#include "device.h" - -#define xstr(a) str(a) -#define str(a) #a - -#if 1 - -/* Enable this if you want pure C for the device. (disable compilation of romtag.asm in that case) - I personally prefer the small ASM blob to steer away from linking challenges. -*/ -const BYTE DeviceName[]; -const BYTE DeviceVersionString[]; -const APTR DeviceInitTab[]; - - -const struct Resident RomTag = { - RTC_MATCHWORD, - ( struct Resident* ) &RomTag, - ( struct Resident* ) &RomTag + 1, - RTF_AUTOINIT, - DEVICEVERSION, - NT_DEVICE, - 0, - (BYTE*)DeviceName, - (BYTE*)DeviceVersionString+6, - (APTR)DeviceInitTab -}; -#endif - -const BYTE DeviceVersionString[] = "$VER: " xstr(DEVICENAME) " " xstr(DEVICEVERSION) "." xstr(DEVICEREVISION) " (" xstr(DEVICEDATE) ")"; -const BYTE DeviceName[] = xstr(DEVICENAME); - -const APTR DeviceFunctions[] = { - (APTR) DevOpen, - (APTR) DevClose, - (APTR) DevExpunge, - (APTR) LibNull, - (APTR) DevBeginIO, - (APTR) DevAbortIO, - (APTR) -1 -}; - - -#define WORDINIT(_a_) UWORD _a_ ##W1; UWORD _a_ ##W2; UWORD _a_ ##ARG; -#define LONGINIT(_a_) UBYTE _a_ ##A1; UBYTE _a_ ##A2; ULONG _a_ ##ARG; -struct DeviceInitData -{ - WORDINIT(w1) - LONGINIT(l1) - WORDINIT(w2) - WORDINIT(w3) - WORDINIT(w4) - LONGINIT(l2) - ULONG end_initlist; -} DeviceInitializers = -{ - INITBYTE( STRUCTOFFSET( Node, ln_Type), NT_DEVICE), - 0x80, (UBYTE) STRUCTOFFSET( Node, ln_Name), (ULONG) &DeviceName[0], - INITBYTE( STRUCTOFFSET(Library,lib_Flags), LIBF_SUMUSED|LIBF_CHANGED ), - INITWORD( STRUCTOFFSET(Library,lib_Version), DEVICEVERSION ), - INITWORD( STRUCTOFFSET(Library,lib_Revision), DEVICEREVISION ), - 0x80, (UBYTE) STRUCTOFFSET(Library,lib_IdString), (ULONG) &DeviceVersionString[6], - (ULONG) 0 -}; - - -const APTR DeviceInitTab[] = { - (APTR) sizeof( DEVBASETYPE ), - (APTR) &DeviceFunctions, - (APTR) &DeviceInitializers, - (APTR) DevInit -}; - - diff --git a/Driver/baxnet/rewrite.txt b/Driver/baxnet/rewrite.txt deleted file mode 100644 index c342639..0000000 --- a/Driver/baxnet/rewrite.txt +++ /dev/null @@ -1,8 +0,0 @@ -TODO-List: - -Nospecialstats in server.c ? -Interrupt on V500 Expansion port ? - - - - diff --git a/Driver/baxnet/Common.mk b/Driver/baxnet/source/Common.mk similarity index 90% rename from Driver/baxnet/Common.mk rename to Driver/baxnet/source/Common.mk index f8da2a1..30fb8c5 100644 --- a/Driver/baxnet/Common.mk +++ b/Driver/baxnet/source/Common.mk @@ -28,7 +28,7 @@ compiler_vcc = 0 # ############################################################################### PREFX = /opt/amigaos-68k/ -PREFX = gg: +#PREFX = gg: SYSINC = $(PREFX)os-include ############################################################################### @@ -43,18 +43,22 @@ CCX = vc LINK = vlink -bamigahunk -x -s -mrel -Cvbcc -Bstatic -nostdlib #-Rshort #LINK = $(CCX) -nostdlib CFLAGS = -Os -+ -sc -c99 -cpu=68020 +CFLAGS2 = -Os -+ -sc -c99 -cpu=68020 + else # GCC CCX = m68k-amigaos-gcc LINK = $(CCX) -nostartfiles -s -CFLAGS = -O3 -s -m68020 -Wall -noixemul -mregparm=4 -fomit-frame-pointer -msoft-float -noixemul +CFLAGS = -O3 -s -m$(CPU) -Wall -noixemul -mregparm=4 -fomit-frame-pointer -msoft-float -noixemul +CFLAGS2 = -O3 -s -m$(CPU2) -Wall -noixemul -mregparm=4 -fomit-frame-pointer -msoft-float -noixemul endif VASM = vasmm68k_mot -VASMFORMAT = -m68020 -Fhunk -nowarn=2064 -quiet -I$(SYSINC) +VASMFORMAT = -m$(CPU) -Fhunk -nowarn=2064 -quiet -I$(SYSINC) +VASMFORMAT2 = -m$(CPU2) -Fhunk -nowarn=2064 -quiet -I$(SYSINC) # unused here #HOST = $(shell uname) @@ -107,7 +111,8 @@ endif # ############################################################################### ifeq ($(debug),1) -CFLAGS += -DDEBUG -g +CFLAGS += -DDEBUG -g +CFLAGS2 += -DDEBUG -g LINKLIBS = -L$(PREFX)/lib -ldebug endif @@ -117,8 +122,8 @@ endif # ############################################################################### -CFLAGS += -I. -CFLAGS += -I$(SUBDIR) +CFLAGS += -I. -I$(SUBDIR) +CFLAGS2 += -I. -I$(SUBDIR) LDFLAGS = ############################################################################### @@ -172,9 +177,9 @@ $(DEVICEID2) : $(OBJECTS2) $(LINK) $(LDFLAGS) -o $@ $(OBJECTS2) $(LINKLIBS) %.2o : %.c - $(CCX) -c $(CFLAGS) $(DEFINES2) $(IPATH) $< -o $@ + $(CCX) -c $(CFLAGS2) $(DEFINES2) $(IPATH) $< -o $@ %.2o : %.asm - ${VASM} $(VASMFORMAT) $(ASMDEFS2) -o $@ $< + ${VASM} $(VASMFORMAT2) $(ASMDEFS2) -o $@ $< diff --git a/Driver/baxnet/Makefile.enc b/Driver/baxnet/source/Makefile.enc similarity index 67% rename from Driver/baxnet/Makefile.enc rename to Driver/baxnet/source/Makefile.enc index eedbe40..ab837d8 100644 --- a/Driver/baxnet/Makefile.enc +++ b/Driver/baxnet/source/Makefile.enc @@ -16,19 +16,29 @@ ############################################################################### ############################################################################### -# Name, version +# Date, version, extra objects to build # ############################################################################### DEVICEVERSION=1 -DEVICEREVISION=91 -DEVICEDATE=06.06.2018 -ASMOBJECTS = $(SUBDIR)/enc624j6l.o $(SUBDIR)/intervaltimer.o +DEVICEREVISION=92 +DEVICEDATE=10.06.2018 SUBDIR=enc624j6net +ASMOBJECTS = $(SUBDIR)/enc624j6l.o $(SUBDIR)/intervaltimer.o + +############################################################################### +# Devices to build (1 or 2, keep DEVICEID2 empty if only one build is desired) +# +############################################################################### DEVICEID=enc624j6net.device DEFINES = # -DPROTO_V2EXPNET ASMDEFS = # -DPROTO_V2EXPNET +CPU = 68020 +DEVICEID2=enc624j6net.device_68000 +DEFINES2 = # -DPROTO_V2EXPNET +ASMDEFS2 = # -DPROTO_V2EXPNET +CPU2 = 68000 ############################################################################### # import generic ruleset diff --git a/Driver/baxnet/Makefile.sdnet b/Driver/baxnet/source/Makefile.sdnet similarity index 98% rename from Driver/baxnet/Makefile.sdnet rename to Driver/baxnet/source/Makefile.sdnet index 3017664..f706828 100644 --- a/Driver/baxnet/Makefile.sdnet +++ b/Driver/baxnet/source/Makefile.sdnet @@ -32,11 +32,12 @@ SUBDIR=sdnet DEVICEID=sdnet.device DEFINES = # -DPROTO_V2EXPNET ASMDEFS = # -DPROTO_V2EXPNET +CPU = 68020 DEVICEID2=v2expeth.device DEFINES2 = -DPROTO_V2EXPNET ASMDEFS2 = -DPROTO_V2EXPNET - +CPU2 = 68020 ############################################################################### # import generic ruleset diff --git a/Driver/baxnet/compiler.h b/Driver/baxnet/source/compiler.h similarity index 94% rename from Driver/baxnet/compiler.h rename to Driver/baxnet/source/compiler.h index 6d885a3..3d77ee6 100644 --- a/Driver/baxnet/compiler.h +++ b/Driver/baxnet/source/compiler.h @@ -35,7 +35,8 @@ #define ASM #define ASMR(x) register #define ASMREG(x) __asm("" #x "") -#define SAVEDS __saveds +//#define SAVEDS __saveds +#define SAVEDS #define STRUCTOFFSET OFFSET /* exec/initializers.h */ #define INLINE static inline @@ -54,7 +55,7 @@ #else /* __VBCC__ */ -#error "Compiler not supported yet in asminterface.h" +#error "Compiler not supported yet in compiler.h" #endif /* __VBCC__ */ #endif /* __GNUC__ */ diff --git a/Driver/baxnet/debug.h b/Driver/baxnet/source/debug.h similarity index 100% rename from Driver/baxnet/debug.h rename to Driver/baxnet/source/debug.h diff --git a/Driver/baxnet/device.c b/Driver/baxnet/source/device.c similarity index 100% rename from Driver/baxnet/device.c rename to Driver/baxnet/source/device.c diff --git a/Driver/baxnet/device.h b/Driver/baxnet/source/device.h similarity index 100% rename from Driver/baxnet/device.h rename to Driver/baxnet/source/device.h diff --git a/Driver/baxnet/deviceheader.c b/Driver/baxnet/source/deviceheader.c similarity index 87% rename from Driver/baxnet/deviceheader.c rename to Driver/baxnet/source/deviceheader.c index 1cbd345..04994dc 100644 --- a/Driver/baxnet/deviceheader.c +++ b/Driver/baxnet/source/deviceheader.c @@ -28,8 +28,8 @@ ASM LONG LibNull( void ) return 0; } -extern const BYTE DeviceName[]; -extern const BYTE DeviceVersionString[]; +extern const char DeviceName[]; +extern const char DeviceVersionString[]; extern const APTR DeviceInitTab[]; const struct Resident _00RomTag = { @@ -40,8 +40,8 @@ const struct Resident _00RomTag = { DEVICEVERSION, NT_DEVICE, 0, - (BYTE*)DeviceName, - (BYTE*)DeviceVersionString+6, + (char*)DeviceName, + (char*)DeviceVersionString+6, (APTR)DeviceInitTab }; #endif diff --git a/Driver/baxnet/deviceinit.c b/Driver/baxnet/source/deviceinit.c similarity index 66% rename from Driver/baxnet/deviceinit.c rename to Driver/baxnet/source/deviceinit.c index 4298245..de66062 100644 --- a/Driver/baxnet/deviceinit.c +++ b/Driver/baxnet/source/deviceinit.c @@ -24,8 +24,8 @@ #define DEVICEEXTRA #endif -const BYTE DeviceVersionString[] = "$VER: " xstr(DEVICENAME) " " xstr(DEVICEVERSION) "." xstr(DEVICEREVISION) xstr(DEVICEEXTRA) " (" xstr(DEVICEDATE) ")"; -const BYTE DeviceName[] = xstr(DEVICENAME); +const char DeviceVersionString[] = "$VER: " xstr(DEVICENAME) " " xstr(DEVICEVERSION) "." xstr(DEVICEREVISION) xstr(DEVICEEXTRA) " (" xstr(DEVICEDATE) ")"; +const char DeviceName[] = xstr(DEVICENAME); const APTR DeviceFunctions[] = { @@ -52,12 +52,12 @@ struct DeviceInitData ULONG end_initlist; } DeviceInitializers = { - INITBYTE( STRUCTOFFSET( Node, ln_Type), NT_DEVICE), - 0x80, (UBYTE) STRUCTOFFSET( Node, ln_Name), (ULONG) &DeviceName[0], - INITBYTE( STRUCTOFFSET(Library,lib_Flags), LIBF_SUMUSED|LIBF_CHANGED ), - INITWORD( STRUCTOFFSET(Library,lib_Version), DEVICEVERSION ), - INITWORD( STRUCTOFFSET(Library,lib_Revision), DEVICEREVISION ), - 0x80, (UBYTE) STRUCTOFFSET(Library,lib_IdString), (ULONG) &DeviceVersionString[6], + INITBYTE( STRUCTOFFSET( Node, ln_Type), NT_DEVICE), + 0x80, (UBYTE) ((LONG)STRUCTOFFSET( Node, ln_Name)), (ULONG) &DeviceName[0], + INITBYTE( STRUCTOFFSET(Library,lib_Flags), LIBF_SUMUSED|LIBF_CHANGED ), + INITWORD( STRUCTOFFSET(Library,lib_Version), DEVICEVERSION ), + INITWORD( STRUCTOFFSET(Library,lib_Revision), DEVICEREVISION ), + 0x80, (UBYTE) ((LONG)STRUCTOFFSET(Library,lib_IdString)), (ULONG) &DeviceVersionString[6], (ULONG) 0 }; diff --git a/Driver/baxnet/enc624j6net.device b/Driver/baxnet/source/enc624j6net.device old mode 100644 new mode 100755 similarity index 85% rename from Driver/baxnet/enc624j6net.device rename to Driver/baxnet/source/enc624j6net.device index af52e762675c0a175c91dfd61df82b8623902b7f..7f9f2a02e049aeb0e54e3dd0175d9a937c4e959d GIT binary patch delta 211 zcmcZ-c_(s$xF|OR0|OTW1LGPXEyBRS{E~rzlY66%wlL$R$q~Za8G|MZh-_q>GWn3m zamEdkyF|Y-&Y0XFHWer?CZ5e0w7E%Ko{{m@=0y?<85u=3yGSWBGtQfwA*;<8H+hPz zC!^iwd$LoQnF0<>E>TS9|KYWYVNouRP9B4nfEL5j$b&R`L}t2QZtj` z2?howpfi-TfY=C#n}E2BfkBxAh)sYv42WxhxQBs31t_K>wmC$#j-3tYcn0QA02XUE AivR!s delta 203 zcmcZ;c_ng!xF{C`0|O8r$ diff --git a/Driver/baxnet/enc624j6net/enc624j6l.asm b/Driver/baxnet/source/enc624j6net/enc624j6l.asm old mode 100644 new mode 100755 similarity index 98% rename from Driver/baxnet/enc624j6net/enc624j6l.asm rename to Driver/baxnet/source/enc624j6net/enc624j6l.asm index 0b53678..f10164c --- a/Driver/baxnet/enc624j6net/enc624j6l.asm +++ b/Driver/baxnet/source/enc624j6net/enc624j6l.asm @@ -109,6 +109,7 @@ ENC_BOARDID EQU 123 ;ZII-IDE-LAN-CP XDEF _enc624j6l_DisableInterrupt XDEF _enc624j6l_EnableGlobalInterrupt XDEF _enc624j6l_DisableGlobalInterrupt + XDEF _enc624j6l_broadcast_multicast_filter ; ; System includes @@ -544,17 +545,7 @@ _enc624j6l_Init: WRITEREG ERXST,a0,d0 ;set RX start pointer (end will be $5fff) WRITEREG PNextPacket,a0,d0 ;set user read pointer - ;Multicast,Broadcast,Unicast(self),MagicPacket,correct CRC,filter runts - ;"not me" Unicast == |ERXFCON_NOTMEEN - moveq #PIO_INIT_MULTI_CAST,d0 - and d1,d0 - beq.s .no_multicast - move #ERXFCON_MCEN|ERXFCON_BCEN|ERXFCON_UCEN|ERXFCON_MPEN|ERXFCON_CRCEN|ERXFCON_RUNTEN,d0 - bra.s .setfilter -.no_multicast - move #ERXFCON_BCEN|ERXFCON_UCEN|ERXFCON_MPEN|ERXFCON_CRCEN|ERXFCON_RUNTEN,d0 -.setfilter - WRITEREG ERXFCON,a0,d0 ;set filter TODO: pattern matching stuff + bsr _enc624j6l_broadcast_multicast_filter ;in: A0/D1, out: D0 move #RXSTOP_INIT&$fffe,d0 WRITEREG ERXTAIL,a0,d0 ;tail pointer in buffer = rx-2, wraparound @@ -604,6 +595,41 @@ _enc624j6l_Init: rts + +;--------------------------------------------------------------------------------------- +; +; apply RX filtering +; +; in: A0 - board base +; D1 - init flags +;out: D0 >0 = OK +; <=0 = FAIL +_enc624j6l_broadcast_multicast_filter: + move.l a0,d0 + beq.s .rts + + ;Multicast,Broadcast,Unicast(self),MagicPacket,correct CRC,filter runts + ;"not me" Unicast == |ERXFCON_NOTMEEN + moveq #PIO_INIT_PROMISC,d0 + and d1,d0 + beq.s .no_promisc + move #ERXFCON_NOTMEEN|ERXFCON_MCEN|ERXFCON_BCEN|ERXFCON_UCEN|ERXFCON_MPEN|ERXFCON_CRCEN|ERXFCON_RUNTEN,d0 + bra.s .setfilter +.no_promisc: + moveq #PIO_INIT_MULTI_CAST,d0 + and d1,d0 + beq.s .no_multicast + move #ERXFCON_MCEN|ERXFCON_BCEN|ERXFCON_UCEN|ERXFCON_MPEN|ERXFCON_CRCEN|ERXFCON_RUNTEN,d0 + bra.s .setfilter +.no_multicast: + move #ERXFCON_BCEN|ERXFCON_UCEN|ERXFCON_MPEN|ERXFCON_CRCEN|ERXFCON_RUNTEN,d0 +.setfilter: + WRITEREG ERXFCON,a0,d0 ;set filter TODO: pattern matching stuff + + moveq #1,d0 +.rts: + rts + ;--------------------------------------------------------------------------------------- ; ; Shutdown hardware @@ -1300,6 +1326,7 @@ _enc624j6l_TransmitFrame: move.l a0,d1 ;no base PTR beq.w .err ;exit + ; this check moved to server.c -> hw.c -> enc624j6l_CheckLinkChange() ; instead of checking with every TX frame, do it before going to sleep ifne _OPT_CHECKLINK_TX @@ -1311,7 +1338,8 @@ _enc624j6l_TransmitFrame: bne.s .linkchg ;jump to parameter adjust .linkchgdone: ;.linkchg returns here with another branch - endc + endc ;_OPT_CHECKLINK_TX + move.l a1,d1 ;no send frame ? beq.w .err ;exit diff --git a/Driver/baxnet/enc624j6net/enc624j6l.h b/Driver/baxnet/source/enc624j6net/enc624j6l.h similarity index 96% rename from Driver/baxnet/enc624j6net/enc624j6l.h rename to Driver/baxnet/source/enc624j6net/enc624j6l.h index 0bfb5f7..969180b 100644 --- a/Driver/baxnet/enc624j6net/enc624j6l.h +++ b/Driver/baxnet/source/enc624j6net/enc624j6l.h @@ -223,6 +223,19 @@ ASM SAVEDS int enc624j6l_TransmitFrame( ASMR(a0) void *board ASMREG(a0 */ ASM SAVEDS int enc624j6l_SetOnline( ASMR(a0) void *board ASMREG(a0) ); +/* + Purpose: set up RX filtering + + input: board - mmapped board base address + flags - broadcast,promiscous, multicast + + output: <0 - error + >=0 - OK +*/ +ASM SAVEDS int enc624j6l_broadcast_multicast_filter( + ASMR(a0) void *board ASMREG(a0), + ASMR(d1) unsigned long flags ASMREG(d1) ); + /* Purpose: disable RX/TX, power down diff --git a/Driver/baxnet/enc624j6net/hw.c b/Driver/baxnet/source/enc624j6net/hw.c similarity index 95% rename from Driver/baxnet/enc624j6net/hw.c rename to Driver/baxnet/source/enc624j6net/hw.c index 8cba1cd..57d13f2 100644 --- a/Driver/baxnet/enc624j6net/hw.c +++ b/Driver/baxnet/source/enc624j6net/hw.c @@ -324,10 +324,24 @@ ASM SAVEDS LONG hw_check_link_change( ASMR(a0) DEVBASEP ASMREG( ASM SAVEDS LONG hw_change_multicast( ASMR(a0) DEVBASEP ASMREG(a0), ASMR(a0) ULONG unit ASMREG(d0), - ASMR(a1) struct List *mclist ASMREG(a1) ) + ASMR(a1) struct List *mcastlist ASMREG(a1) ) { - /* TODO: implement Multicast hashing */ + APTR boardbase = db->db_Units[unit].duh_BASE; + ULONG flags; + + flags = PIO_INIT_BROAD_CAST; + + if( db->db_Units[0].du_Flags & DUF_PROMISC ) + flags |= PIO_INIT_PROMISC; + + /* list non-empty ? (kludge right now, can be done more fine grained) */ + if( mcastlist->lh_Head->ln_Succ ) + flags |= PIO_INIT_MULTI_CAST; + + enc624j6l_broadcast_multicast_filter(boardbase, flags );/* flags & (PIO_INIT_BROAD_CAST|PIO_INIT_MULTI_CAST) ); */ + + return 1; } diff --git a/Driver/baxnet/enc624j6net/hwprivate.h b/Driver/baxnet/source/enc624j6net/hwprivate.h similarity index 100% rename from Driver/baxnet/enc624j6net/hwprivate.h rename to Driver/baxnet/source/enc624j6net/hwprivate.h diff --git a/Driver/baxnet/enc624j6net/intervaltimer.asm b/Driver/baxnet/source/enc624j6net/intervaltimer.asm similarity index 100% rename from Driver/baxnet/enc624j6net/intervaltimer.asm rename to Driver/baxnet/source/enc624j6net/intervaltimer.asm diff --git a/Driver/baxnet/enc624j6net/intervaltimer.h b/Driver/baxnet/source/enc624j6net/intervaltimer.h similarity index 100% rename from Driver/baxnet/enc624j6net/intervaltimer.h rename to Driver/baxnet/source/enc624j6net/intervaltimer.h diff --git a/Driver/baxnet/enc624j6net/intervaltimer.i b/Driver/baxnet/source/enc624j6net/intervaltimer.i similarity index 100% rename from Driver/baxnet/enc624j6net/intervaltimer.i rename to Driver/baxnet/source/enc624j6net/intervaltimer.i diff --git a/Driver/baxnet/enc624j6net/macros.i b/Driver/baxnet/source/enc624j6net/macros.i similarity index 100% rename from Driver/baxnet/enc624j6net/macros.i rename to Driver/baxnet/source/enc624j6net/macros.i diff --git a/Driver/baxnet/enc624j6net/registers.h b/Driver/baxnet/source/enc624j6net/registers.h similarity index 100% rename from Driver/baxnet/enc624j6net/registers.h rename to Driver/baxnet/source/enc624j6net/registers.h diff --git a/Driver/baxnet/enc624j6net/registers.i b/Driver/baxnet/source/enc624j6net/registers.i similarity index 100% rename from Driver/baxnet/enc624j6net/registers.i rename to Driver/baxnet/source/enc624j6net/registers.i diff --git a/Driver/baxnet/hw.h b/Driver/baxnet/source/hw.h similarity index 100% rename from Driver/baxnet/hw.h rename to Driver/baxnet/source/hw.h diff --git a/Driver/baxnet/macros.h b/Driver/baxnet/source/macros.h similarity index 100% rename from Driver/baxnet/macros.h rename to Driver/baxnet/source/macros.h diff --git a/Driver/baxnet/sdnet/enc28j60.c b/Driver/baxnet/source/sdnet/enc28j60.c similarity index 100% rename from Driver/baxnet/sdnet/enc28j60.c rename to Driver/baxnet/source/sdnet/enc28j60.c diff --git a/Driver/baxnet/sdnet/enc28j60.h b/Driver/baxnet/source/sdnet/enc28j60.h similarity index 100% rename from Driver/baxnet/sdnet/enc28j60.h rename to Driver/baxnet/source/sdnet/enc28j60.h diff --git a/Driver/baxnet/sdnet/enc28j60l.asm b/Driver/baxnet/source/sdnet/enc28j60l.asm old mode 100644 new mode 100755 similarity index 89% rename from Driver/baxnet/sdnet/enc28j60l.asm rename to Driver/baxnet/source/sdnet/enc28j60l.asm index 42ac69d..598d81d --- a/Driver/baxnet/sdnet/enc28j60l.asm +++ b/Driver/baxnet/source/sdnet/enc28j60l.asm @@ -638,6 +638,7 @@ _enc28j60l_ReadBuffer: movem.l d3-d5,-(sp) ;CSDELAY lea.l SDCARD_DATA_W,a0 ;SPI_OUT + move.b #ENC28J60_READ_BUF_MEM,(a0) move.b #_OPT_READ_CONST,d4 ;_OPT_READ_CONST move.b (a0),d3 ;wait ;write and read register are the same on Vampire @@ -663,118 +664,6 @@ _enc28j60l_ReadBuffer: rts - ifne 0 -; Read a number of Bytes from the ENC28J60 -; note: ENC28J60 Read pointer assumed to be written already -;A1 = Ptr -;D0 = Size -_enc28j60l_ReadBuffer_complicated: - - SPI_ENABLE - movem.l d3-d5,-(sp) - ;CSDELAY - lea.l SDCARD_DATA_W,a0 ;SPI_OUT - move.b #ENC28J60_READ_BUF_MEM,(a0) - moveq #7,d1 - and.l d0,d1 - lsr.l #3,d0 - move.b #_OPT_READ_CONST,d4 ;_OPT_READ_CONST - - move.b (a0),d3 ;wait ;write and read register are the same on Vampire - - tst.l d0 - beq.s .nomain - - ;CSDELAY - - ifne 1 - ;----------------------- NEW -------------------------- - - rept 4 - move.b d4,(a0) ;provide clock (0xff here) - lsl.l #8,d5 - move.b (a0),d5 - endr - bra.s .loop_enter -.loop: - move.b (a0),d5 - - move.b d4,(a0) ;provide clock (0xff here) - move.l d5,(a1)+ - move.b (a0),d5 - - rept 3 - move.b d4,(a0) ;provide clock (0xff here) - lsl.l #8,d5 - move.b (a0),d5 - endr - -.loop_enter: - move.b d4,(a0) ;provide clock (0xff here) - move.l d5,(a1)+ - move.b (a0),d5 - - rept 2 - move.b d4,(a0) ;provide clock (0xff here) - lsl.l #8,d5 - move.b (a0),d5 - endr - - move.b d4,(a0) ;provide clock (0xff here) - lsl.l #8,d5 - - subq.l #1,d0 - bne.s .loop - - move.b (a0),d5 - move.l d5,(a1)+ - - ;----------------------- NEW -------------------------- - else - ;----------------------- OLD -------------------------- -.loop: - rept 4 - move.b d4,(a0) ;provide clock (0xff here) - lsl.l #8,d5 - move.b (a0),d5 - endr - - move.b d4,(a0) ;provide clock (0xff here) - move.l d5,(a1)+ - move.b (a0),d5 - - rept 3 - move.b d4,(a0) ;provide clock (0xff here) - lsl.l #8,d5 - move.b (a0),d5 - endr - - move.l d5,(a1)+ - - subq.l #1,d0 - bne.s .loop - - ;----------------------- OLD -------------------------- - endc - -.nomain: - tst.l d1 -.tail: - beq.s .notail - move.b d4,(a0) ;provide clock (0xff here) - move.b (a0),(a1)+ ;read data being shifted in - subq.l #1,d1 - bra.s .tail -.notail: - - movem.l (sp)+,d3-d5 - - ;CSDELAY - SPI_DISABLE - - rts - endc - ; Write a number of Bytes to the ENC28J60 ; ;A1 = Ptr @@ -801,8 +690,6 @@ _enc28j60l_WriteBuffer: ;-> 1st byte is control byte move.b #$f,(a0) ;1=Override, 2=CRCGEN, 4=PADDING, 8=HUGE ENABLE - ifne 1 - .loopwb: move.b (a1)+,d1 move.b (a0),d0 @@ -814,49 +701,6 @@ _enc28j60l_WriteBuffer: move.b (a0),d0 ;last wait - else - - moveq #7,d1 ; - and.l d4,d1 ;tail bytes - lsr.l #3,d4 ;8 bytes written in one run - - move.b (a0),d0 ;wait - -loopwb$ - ; 8 bytes in one run, avoiding subq/bne overhead - move.b (a1)+,(a0) - move.b (a0),d0 ;wait - move.b (a1)+,(a0) - move.b (a0),d0 ;wait - move.b (a1)+,(a0) - move.b (a0),d0 ;wait - move.b (a1)+,(a0) - move.b (a0),d0 ;wait - move.b (a1)+,(a0) - move.b (a0),d0 ;wait - move.b (a1)+,(a0) - move.b (a0),d0 ;wait - move.b (a1)+,(a0) - move.b (a0),d0 ;wait - move.b (a1)+,(a0) - move.b (a0),d0 ;wait - - subq.l #1,d4 - bne.s loopwb$ - - ; leftover bytes ? - tst.l d1 -looptail$ - beq.s notail$ - move.b (a1)+,(a0) - move.b (a0),d0 ;wait - subq.l #1,d1 - bra.s looptail$ -notail$ - - endc - - movem.l (sp)+,d3-d5 ;restore registers before SPI_DISABLE ; CSDELAY diff --git a/Driver/baxnet/sdnet/enc28j60l.h b/Driver/baxnet/source/sdnet/enc28j60l.h old mode 100644 new mode 100755 similarity index 100% rename from Driver/baxnet/sdnet/enc28j60l.h rename to Driver/baxnet/source/sdnet/enc28j60l.h diff --git a/Driver/baxnet/sdnet/hw.c b/Driver/baxnet/source/sdnet/hw.c similarity index 100% rename from Driver/baxnet/sdnet/hw.c rename to Driver/baxnet/source/sdnet/hw.c diff --git a/Driver/baxnet/sdnet/hwprivate.h b/Driver/baxnet/source/sdnet/hwprivate.h similarity index 100% rename from Driver/baxnet/sdnet/hwprivate.h rename to Driver/baxnet/source/sdnet/hwprivate.h diff --git a/Driver/baxnet/sdnet/intervaltimer.asm b/Driver/baxnet/source/sdnet/intervaltimer.asm similarity index 100% rename from Driver/baxnet/sdnet/intervaltimer.asm rename to Driver/baxnet/source/sdnet/intervaltimer.asm diff --git a/Driver/baxnet/sdnet/intervaltimer.h b/Driver/baxnet/source/sdnet/intervaltimer.h similarity index 100% rename from Driver/baxnet/sdnet/intervaltimer.h rename to Driver/baxnet/source/sdnet/intervaltimer.h diff --git a/Driver/baxnet/sdnet/intervaltimer.i b/Driver/baxnet/source/sdnet/intervaltimer.i similarity index 100% rename from Driver/baxnet/sdnet/intervaltimer.i rename to Driver/baxnet/source/sdnet/intervaltimer.i diff --git a/Driver/baxnet/sdnet/vampuuid.asm b/Driver/baxnet/source/sdnet/vampuuid.asm similarity index 100% rename from Driver/baxnet/sdnet/vampuuid.asm rename to Driver/baxnet/source/sdnet/vampuuid.asm diff --git a/Driver/baxnet/sdnet/vampuuid.h b/Driver/baxnet/source/sdnet/vampuuid.h old mode 100644 new mode 100755 similarity index 100% rename from Driver/baxnet/sdnet/vampuuid.h rename to Driver/baxnet/source/sdnet/vampuuid.h diff --git a/Driver/baxnet/server.c b/Driver/baxnet/source/server.c similarity index 100% rename from Driver/baxnet/server.c rename to Driver/baxnet/source/server.c diff --git a/Driver/baxnet/server.h b/Driver/baxnet/source/server.h similarity index 100% rename from Driver/baxnet/server.h rename to Driver/baxnet/source/server.h From c8e56a5e98c49906164b30986c994f5ad0f856e5 Mon Sep 17 00:00:00 2001 From: HenrykRichter Date: Thu, 14 Jun 2018 08:38:42 +0200 Subject: [PATCH 2/2] readme update --- Driver/readme.txt | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/Driver/readme.txt b/Driver/readme.txt index cc46c1b..44f4139 100644 --- a/Driver/readme.txt +++ b/Driver/readme.txt @@ -1 +1,12 @@ -The driver belongs here! \ No newline at end of file +These are the AmigaOS drivers for the subsystems of the board. + +Please note that two Network drivers are present. The files in "enc624j6net" +are for the initial/legacy SANA-II driver, derived from the PlipBox code base. + +The recommended SANA-II driver for the Ethernet port is located in "baxnet". +The "baxnet" based driver supports additional SANA-II features, is faster and +at supports more than one card at the same time. + + + +