From 19dd61efcc1fe07c6a66f48f74b7926607f3a541 Mon Sep 17 00:00:00 2001 From: Uwe Hermann Date: Sat, 21 Jul 2012 20:37:41 +0200 Subject: [PATCH 1/1] srd: Rename onewire_transport to maxim_ds28ea00. It doesn't make sense to have one "generic" onewire_transport PD, as this layer is very much device-specific and such a generic PD would have to contain an accumulation of all possible features and commands and handling code of all existing (now and in the future) 1-Wire devices, which is neither possible nor useful nor elegant. There are (for example) 1-Wire thermometers, RTCs, EEPROMs, special-purpose security chips with passwords/keys, battery monitoring chips, and many many others. They all have a different set of features, commands and command codes, RAM areas/sizes/partitioning/contents, protocols, and so on. Thus, the layering for 1-Wire PD stacks should look like this: onewire_link -> onewire_network -> Examples: onewire_link -> onewire_network -> maxim_ds28ea00 (special thermometer) onewire_link -> onewire_network -> maxim_ds2431 (1kbit EEPROM) onewire_link -> onewire_network -> maxim_ds2417 (RTC) onewire_link -> onewire_network -> maxim_ds2762 (battery monitor) onewire_link -> onewire_network -> maxim_ds1961s (SHA-1 eCash iButton) and so on... So, renaming onewire_transport to maxim_ds28ea00. The non-DS28EA00 specific code will be dropped and/or moved to other PDs on top of onewire_network later. --- configure.ac | 2 +- decoders/Makefile.am | 2 +- decoders/{onewire_transport => maxim_ds28ea00}/Makefile.am | 4 ++-- decoders/{onewire_transport => maxim_ds28ea00}/__init__.py | 2 +- .../onewire_transport.py => maxim_ds28ea00/maxim_ds28ea00.py} | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) rename decoders/{onewire_transport => maxim_ds28ea00}/Makefile.am (89%) rename decoders/{onewire_transport => maxim_ds28ea00}/__init__.py (98%) rename decoders/{onewire_transport/onewire_transport.py => maxim_ds28ea00/maxim_ds28ea00.py} (99%) diff --git a/configure.ac b/configure.ac index 76f7103..c999efd 100644 --- a/configure.ac +++ b/configure.ac @@ -172,7 +172,7 @@ AC_CONFIG_FILES([Makefile decoders/usb_protocol/Makefile decoders/onewire_link/Makefile decoders/onewire_network/Makefile - decoders/onewire_transport/Makefile + decoders/maxim_ds28ea00/Makefile ]) AC_OUTPUT diff --git a/decoders/Makefile.am b/decoders/Makefile.am index 87e9040..1646a1b 100644 --- a/decoders/Makefile.am +++ b/decoders/Makefile.am @@ -44,5 +44,5 @@ SUBDIRS = \ usb_protocol \ onewire_link \ onewire_network \ - onewire_transport + maxim_ds28ea00 diff --git a/decoders/onewire_transport/Makefile.am b/decoders/maxim_ds28ea00/Makefile.am similarity index 89% rename from decoders/onewire_transport/Makefile.am rename to decoders/maxim_ds28ea00/Makefile.am index 982525d..ee53993 100644 --- a/decoders/onewire_transport/Makefile.am +++ b/decoders/maxim_ds28ea00/Makefile.am @@ -18,9 +18,9 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -pkgdatadir = $(DECODERS_DIR)/onewire_transport +pkgdatadir = $(DECODERS_DIR)/maxim_ds28ea00 -dist_pkgdata_DATA = __init__.py onewire_transport.py +dist_pkgdata_DATA = __init__.py maxim_ds28ea00.py CLEANFILES = *.pyc diff --git a/decoders/onewire_transport/__init__.py b/decoders/maxim_ds28ea00/__init__.py similarity index 98% rename from decoders/onewire_transport/__init__.py rename to decoders/maxim_ds28ea00/__init__.py index df4db00..c6f063d 100644 --- a/decoders/onewire_transport/__init__.py +++ b/decoders/maxim_ds28ea00/__init__.py @@ -53,4 +53,4 @@ TODO: - add CRC checks for transport layer ''' -from .onewire_transport import * +from .maxim_ds28ea00 import * diff --git a/decoders/onewire_transport/onewire_transport.py b/decoders/maxim_ds28ea00/maxim_ds28ea00.py similarity index 99% rename from decoders/onewire_transport/onewire_transport.py rename to decoders/maxim_ds28ea00/maxim_ds28ea00.py index e787091..96a5aab 100644 --- a/decoders/onewire_transport/onewire_transport.py +++ b/decoders/maxim_ds28ea00/maxim_ds28ea00.py @@ -46,7 +46,7 @@ command = { class Decoder(srd.Decoder): api_version = 1 - id = 'onewire_transport' + id = 'maxim_ds28ea00' name = '1-Wire transport layer' longname = '1-Wire serial communication bus' desc = 'Bidirectional, half-duplex, asynchronous serial bus.' -- 2.30.2