From 49c0827c4fc756c3fc96abe5ff4045fcb0072ff9 Mon Sep 17 00:00:00 2001 From: Allen Hill Date: Thu, 23 Jul 2015 21:23:36 -0700 Subject: [PATCH] Compile/linking required changes --- AVCLanDriver.o | Bin 23580 -> 0 bytes GlobalDef.c | 37 +++++ GlobalDef.h | 32 +++++ Makefile | 10 +- ToyotaAuxEnabler.elf | Bin 23893 -> 0 bytes ToyotaAuxEnabler.hex | 327 ------------------------------------------- ToyotaAuxEnabler.o | Bin 8856 -> 0 bytes USART.o | Bin 7936 -> 0 bytes avclandrv.c | 81 ++++++----- avclandrv.h | 22 +-- com232.c | 28 ++-- com232.h | 18 +-- sniffer.c | 46 +++--- 13 files changed, 179 insertions(+), 422 deletions(-) delete mode 100644 AVCLanDriver.o create mode 100644 GlobalDef.c delete mode 100755 ToyotaAuxEnabler.elf delete mode 100644 ToyotaAuxEnabler.hex delete mode 100644 ToyotaAuxEnabler.o delete mode 100644 USART.o diff --git a/AVCLanDriver.o b/AVCLanDriver.o deleted file mode 100644 index 610061352d8d4805867f14e231eb7de01c288f53..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 23580 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 diff --git a/GlobalDef.c b/GlobalDef.c new file mode 100644 index 0000000..f92477d --- /dev/null +++ b/GlobalDef.c @@ -0,0 +1,37 @@ +/* + Copyright (C) 2006 Marcin Slonicki . + + 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 2 + 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, write to the Free Software Foundation, + Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + + ----------------------------------------------------------------------- + this file is a part of the TOYOTA Corolla MP3 Player Project + ----------------------------------------------------------------------- + http://www.softservice.com.pl/corolla/avc + + May 28 / 2009 - version 2 + +*/ + +#include "GlobalDef.h" +//------------------------------------------------------------------------------ + + +// max 10 events in fifo +byte EventCount; +byte EventCmd[10]; +byte Event; + +byte showLog; +byte showLog2; diff --git a/GlobalDef.h b/GlobalDef.h index d91f91a..80a52c9 100644 --- a/GlobalDef.h +++ b/GlobalDef.h @@ -46,6 +46,38 @@ typedef unsigned int word; inline void LedOff( void ); inline void LedOn( void ); +/*-------------------------------------------------------------------------------------------------- + From Marcin's "const.h" +--------------------------------------------------------------------------------------------------*/ + +// max 10 events in fifo +extern byte EventCount; +extern byte EventCmd[10]; +extern byte Event; + +#define EV_NOTHING 0 +#define EV_DISPLAY 1 +#define EV_STATUS 4 + +//------------------------------------------------------------------------------ + +// const +#define smYear 1 +#define smMonth 2 +#define smDay 3 +#define smHour 4 +#define smMin 5 +#define smWDay 6 + + + +//#define STOPEvent cbi(TIMSK, TOIE1); cbi(UCSRB, RXCIE); +//#define STARTEvent sbi(TIMSK, TOIE1); sbi(UCSRB, RXCIE); + + +extern byte showLog; +extern byte showLog2; + #endif // _GLOBALDEF_H_ /*-------------------------------------------------------------------------------------------------- diff --git a/Makefile b/Makefile index 0aaef90..c05afb1 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,6 @@ CC=avr-g++ -CFLAGS=-c -g -Os -Wall -fno-exceptions -fpermissive -ffunction-sections -fdata-sections -fno-threadsafe-statics -mmcu=atmega328p +CFLAGS=-c -g -Os -Wall -mmcu=atmega328p +CFLAGS+=-fno-exceptions -fpermissive -ffunction-sections -fdata-sections -fno-threadsafe-statics DEFS= -DF_CPU=16000000L -DARDUINO=10605 -DARDUINO_AVR_DUEMILANOVE -DARDUINO_ARCH_AVR LFLAGS=-g -MMD -mmcu=atmega328p @@ -8,8 +9,8 @@ all: sniffer.hex sniffer.hex: sniffer.elf avr-objcopy -j .text -j .data -O ihex sniffer.elf sniffer.hex -sniffer.elf: sniffer.o com232.o avclandrv.o - $(CC) $(LFLAGS) $(DEFS) -o sniffer.elf sniffer.o com232.o avclandrv.o +sniffer.elf: sniffer.o com232.o avclandrv.o GlobalDef.o + $(CC) $(LFLAGS) $(DEFS) -o sniffer.elf sniffer.o com232.o avclandrv.o GlobalDef.o sniffer.o: sniffer.c GlobalDef.h com232.h avclandrv.h $(CC) $(CFLAGS) $(DEFS) sniffer.c @@ -20,6 +21,9 @@ com232.o: com232.c com232.h GlobalDef.h avclandrv.o: avclandrv.c GlobalDef.h com232.h avclandrv.h $(CC) $(CFLAGS) $(DEFS) avclandrv.c +GlobalDef.o: GlobalDef.c GlobalDef.h + $(CC) $(CFLAGS) $(DEFS) GlobalDef.c + clean: rm *.o *.hex *.elf diff --git a/ToyotaAuxEnabler.elf b/ToyotaAuxEnabler.elf deleted file mode 100755 index 7c3793d44175eae438411aa2d77cf65b3ac771b1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 23893 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 diff --git a/ToyotaAuxEnabler.hex b/ToyotaAuxEnabler.hex deleted file mode 100644 index de5b172..0000000 --- a/ToyotaAuxEnabler.hex +++ /dev/null @@ -1,327 +0,0 @@ -:100000000C942D020C944A020C944A020C944A025D -:100010000C944A020C944A020C944A020C944A0230 -:100020000C944A020C944A020C944A020C944A0220 -:100030000C944A020C944A020C944A020C944A0210 -:100040000C944A020C944A020C944A020C944A0200 -:100050000C944A020C944A020C944A020C944A02F0 -:100060000C944A020C944A023C03B704B704860479 -:100070008D04B30454044003CA030909436F707923 -:1000800072696768742028432920323030372C2069 -:100090005369676D614F626A6563747320496E636B -:1000A0002E0D0A000D0A09092020202020546F7906 -:1000B0006F7461204156432D4C616E20415558208C -:1000C000456E61626C65720D0A000D0A00202020E9 -:1000D0004465736372697074696F6E3A20202020E2 -:1000E000000D0A41555820456E61626C6572202DE5 -:1000F0002D2D3E3E2048550D0A000D0A4155582031 -:10010000456E61626C6572203C3C2D2D2D2048555A -:100110000D0A0041766350726F63657373416374B7 -:10012000696F6E49443A20556E6B6E6F776E206131 -:100130006374696F6E204944210D0A00556E6B6E21 -:100140006F776E206D65737361676521004176631B -:10015000526561644D6573736167653A20546869DF -:1001600073206D65737361676520697320666F72B4 -:10017000206D65210D0A00417663526561644D650D -:1001800073736167653A2050617269747920657292 -:10019000726F722040204461746153697A65210D49 -:1001A0000A00417663526561644D657373616765EA -:1001B0003A20506172697479206572726F722040C2 -:1001C00020436F6E74726F6C210D0A00417663528A -:1001D0006561644D6573736167653A20506172694A -:1001E0007479206572726F72204020536C6176655D -:1001F00041646472657373210D0A00417663526530 -:1002000061644D6573736167653A2050617269740A -:1002100079206572726F722040204D61737465722F -:1002200041646472657373210D0A000100050001C9 -:1002300011516100000000000044697361626C6547 -:100240002041555800000000000001000500011188 -:100250005061000000000000456E61626C65204145 -:100260005558000000000000000100041101450184 -:100270000000000000000041555820696E20757391 -:10028000650000000000000002000411014560004C -:1002900000000000000054756E657220696E2075C4 -:1002A00073650000000000030004110145610000B7 -:1002B00000000000005461706520696E2075736550 -:1002C000000000000000040004110145620000006D -:1002D00000000000434420696E2075736500000033 -:1002E00000000000000000031101460000000000B3 -:1002F0000000004E6F2064657669636520696E209A -:10030000757365000000031101200000000000006B -:10031000000050696E67000000000000000000004F -:100320000000000700056031F1010100000000003D -:100330000054756E6572205374617475730000000B -:10034000000005000A6231F1003001000000008069 -:10035000456A65637420434400000000000000000B -:100360000006000A6231F100F80101000000804E31 -:100370006F20434400000000000000000000000067 -:100380000800047431F19000000000000000417585 -:1003900064696F2053746174757300000000000974 -:1003A00000047431A090000000000000004175645A -:1003B000696F2053746174757300000000000A00B7 -:1003C0000300010A00000000000000004C414E2024 -:1003D000537461747573000000000000000B00038B -:1003E00011010000000000000000004C414E2052AE -:1003F0006567697374657200000000000C000311EA -:10040000010100000000000000004C414E20526538 -:1004100073746172740000000000000D000311018C -:100420002000000000000000004C414E20436865A1 -:10043000636B0000000000000000000000000000EE -:1004400000000000000000000000000000000000AC -:100450000000000000000000000011241FBECFEFCC -:10046000D8E0DEBFCDBF12E0A0E0B1E0E0EEF2E107 -:1004700002C005900D92AA37B107D9F723E0AAE789 -:10048000B2E001C01D92A83DB207E1F70E946002F0 -:100490000C946E090C940000259A2D9A82E085BD7B -:1004A0000E9490025B9A5A982FE088E190E00FB684 -:1004B000F894A895809360000FBE20936000089583 -:1004C0000E944C0284EA90E00E94BF028AE790E01A -:1004D0000E94BF0280E091E09F938F938CE091E0B7 -:1004E0009F938F9381E191E09F938F938AE792E0AE -:1004F0009F938F930E949D068AE792E00E94B30229 -:100500008DB79EB708960FB6F8949EBF0FBE8DBFED -:10051000A8950E947F050097D9F30E942C03F8CF7D -:10052000E1ECF0E010821092C00086E88093C200F7 -:1005300087E68093C400589A88E18083089580916B -:10054000C000881F8827881F08958091C00087FFFA -:10055000FCCF8091C60008959091C00095FFFCCF1C -:100560008093C6000895CF93DF93EC01899188238F -:1005700019F00E94AC02FACFDF91CF910895CF938A -:10058000DF93FC018491EF012196882321F00E94E2 -:10059000AC02FE01F7CFDF91CF9108959C01225F5D -:1005A0003F4F3093D7032093D603FC01249141E0C1 -:1005B000211101C040E04093D50320E633E03093A1 -:1005C000D4032093D303411103C02FEF31E002C0C5 -:1005D00020E931E03093D2032093D103FC0132961D -:1005E00044914093CF0331962EEC32E0D9015A2F3B -:1005F000521B541720F454915D933196F8CF08950F -:10060000282F1092CE0380E090E041E02150A8F026 -:10061000880F991F00B605FC02C0A895FBCF16BC39 -:1006200000B605FCFDCF36B5343380F781603091DC -:10063000CE0334273093CE03E9CF089516BC8AB198 -:100640008C608AB986B58034E8F38AB1837F8AB931 -:1006500086B58A34E8F30895EF92FF920F931F93C3 -:10066000CF93DF93FC013197E930F10508F07BC1AE -:10067000EC5CFF4F0C94900681E08093CD0277C133 -:100680008CE291E00E94B30266E371E08AE792E0B7 -:100690000E9496068AE792E00E94B30268E471E045 -:1006A0008AE792E00E9496068AE792E00E94B302EF -:1006B0008091D2021F928F930CE112E01F930F934F -:1006C000CAE7D2E0DF93CF930E949D06CE010E943D -:1006D000B30265E571E0CE010E949606CE010E944C -:1006E000B3028091D3021F928F931F930F93DF93D6 -:1006F000CF930E949D06CE010E94B30263E671E093 -:10070000CE010E949606CE010E94B3028091D402CF -:100710001F928F931F930F93DF93CF930E949D0699 -:10072000CE010E94B3026EE671E0CE010E949606F1 -:10073000CE010E94B3028091D5021F928F931F9326 -:100740000F93DF93CF930E949D06CE010E94B302C8 -:1007500069E771E0CE010E949606CE010E94B302C5 -:100760008091D7021F928F931F930F93DF93CF93A4 -:100770000E949D06CE010E94B3028CE291E00E948D -:10078000B3028DB79EB74E960FB6F8949EBF0FBEBC -:100790008DBFEDC08CE291E00E94B30266E871E08B -:1007A0008AE792E00E9496068AE792E00E94B302EE -:1007B00068E471E08AE792E00E9496068AE792E098 -:1007C0000E94B3028091D2021F928F930CE112E03B -:1007D0001F930F93CAE7D2E0DF93CF930E949D0649 -:1007E000CE010E94B30265E571E0CE010E9496063B -:1007F000CE010E94B3028091D3021F928F931F9368 -:100800000F93DF93CF930E949D06CE010E94B30207 -:1008100063E671E0CE010E949606CE010E94B3020B -:100820008091D4021F928F931F930F93DF93CF93E6 -:100830000E949D06CE010E94B3026EE671E0CE01D9 -:100840000E949606CE010E94B3028091D5021F92AB -:100850008F931F930F93DF93CF930E949D06CE013A -:100860000E94B30269E771E0CE010E949606CE01B4 -:100870000E94B3028091D7021F928F931F930F9310 -:10088000DF93CF930E949D06CE010E94B3028CE2BB -:1008900091E00E94B3028DB79EB74E960FB6F894C2 -:1008A0009EBF0FBE8DBF63C08CE291E00E94B30279 -:1008B00068E971E08AE792E00E9496068AE792E092 -:1008C0000E94B302C3EDD2E044EBE42E41E0F42EEB -:1008D0000AE712E089911F928F93FF92EF921F9384 -:1008E0000F930E949D068AE792E00E94B3020F9048 -:1008F0000F900F900F900F900F9092E0C63DD90788 -:1009000049F78CE291E00E94B30231C09093CC028F -:100910008093CB021092CD022AC08091CB0290919D -:10092000CC02049721F18091CD02882339F08BE22B -:1009300092E00E94CE021092CD0207C08AE492E0BB -:100940000E94CE0281E08093CD0216BC00B605FC69 -:10095000FCCF86B58B34D0F32D9816BC8AB18C6051 -:100960008AB986B5FECF83E191E00E94BF0280E0A4 -:10097000DF91CF911F910F91FF90EF90089581E04B -:100980008093D50380E693E09093D4038093D303C0 -:1009900080E991E09093D2038093D1038FE080931C -:1009A000D0038BE090E00E942C0381E00895FF9239 -:1009B0000F931F93CF93DF93882319F08AEF90E072 -:1009C00002C081EE90E00E94BF028DEC90E00E9498 -:1009D000BF028091D6039091D7030E94BF028AEC98 -:1009E00090E00E94BF028091D5031F928F9388EB05 -:1009F00091E09F938F93CAE7D2E0DF93CF930E9459 -:100A00009D06CE010E94B3028091D4038F93809102 -:100A1000D3038F9381ED91E09F938F93DF93CF93D7 -:100A20000E949D06CE010E94B3028091D2038F9353 -:100A30008091D1038F938CEE91E09F938F93DF93FE -:100A4000CF930E949D06CE010E94B3028091D003F5 -:100A50001F928F9387E092E09F938F93DF93CF93C2 -:100A60000E949D06CE010E94B3028091CF031F9287 -:100A70008F9382E292E09F938F93DF93CF930E94B4 -:100A80009D06CE010E94B3026BE372E0CE010E948C -:100A90009606CE010E94B3028DB79EB74E960FB652 -:100AA000F8949EBF0FBE8DBFF12CC4EBD1E00AE7D6 -:100AB00012E08091CF03F816C8F4EF2DF0E0E25376 -:100AC000FD4F80811F928F93DF93CF931F930F93DE -:100AD0000E949D068AE792E00E94B302F3940F9071 -:100AE0000F900F900F900F900F90E3CF8CE291E05A -:100AF000DF91CF911F910F91FF900C94B302AF92B1 -:100B0000BF92CF92DF92EF92FF920F931F93CF93FA -:100B1000DF9381E00E9400032D9881E00E94000392 -:100B200021E0892B09F420E02093D5038CE00E947A -:100B300000039093D4038093D303C091CE03D0E0FD -:100B400081E00E940003C817D90719F08BEF91E0EC -:100B50004AC08CE00E940003EC019093D203809382 -:100B6000D1030091CE0310E081E00E94000308173A -:100B7000190719F08CEC91E036C0BB24B394C03651 -:100B8000D34029F0B12C81E00E94000302C00E94F2 -:100B90001E0384E00E9400038093D003C091CE0323 -:100BA000D0E081E00E940003C817D90719F082EA5B -:100BB00091E019C0BB2019F00E941E0303C081E020 -:100BC0000E94000388E00E940003A82E8093CF03B8 -:100BD000C091CE03D0E081E00E940003C817D9077E -:100BE00029F087E791E00E94BF023CC0BB2019F0CA -:100BF0000E941E0303C081E00E9400035EECE52E0C -:100C000052E0F52EE70104C0BB2079F10E941E03DB -:100C10008C2F8E198A1568F58E010E5C124088E0C3 -:100C20000E9400038993C090CE03D12C81E00E94E2 -:100C30000003C816D90641F31F930F938FE492E087 -:100C40009F938F938AE792E09F938F930E949D06D4 -:100C50008AE792E00E94B3020F900F900F900F90DE -:100C60000F900F90C0E0D0E04FC081E00E940003E1 -:100C7000CFCFBB2021F08DE491E00E94BF028CE336 -:100C800091E09093D7038093D6032BE632E080E087 -:100C900090E0BFE1A0E0B89FB001B99F700D1124B2 -:100CA000F9014491A417E8F44A2F50E0FA01E60F45 -:100CB000F71FE459FD4FE491EA01C253DD4F48812B -:100CC0004E1302C0AF5FECCF0196215E3F4F8031E3 -:100CD000910501F7C0E0D0E080E00E94D7042D9A92 -:100CE00013C02FE1289FF001299FF00D1124CF019F -:100CF00089589D4F9093D7038093D603E759FD4FB2 -:100D0000E491CE2FD0E0E8CFCE01DF91CF911F91BB -:100D10000F91FF90EF90DF90CF90BF90AF9008952C -:100D2000EE0FFF1F0590F491E02D0994FB01DC010B -:100D300001900D920020E1F70895AEE0B0E0E3EA03 -:100D4000F6E00C9445090D891E8986E08C831A8390 -:100D500009838FEF9FE79E838D83AE01475E5F4FD0 -:100D60006F89788DCE0101960E94BF06EF81F885CC -:100D7000E00FF11F10822E96E4E00C946109ACE0C4 -:100D8000B0E0E5ECF6E00C9437097C016B018A01D8 -:100D9000FC0117821682838181FFBDC1CE010196BD -:100DA0004C01F7019381F60193FD859193FF8191A9 -:100DB0006F01882309F4ABC1853239F493FD859125 -:100DC00093FF81916F01853229F4B70190E00E9471 -:100DD000A708E7CF512C312C20E02032A0F48B3231 -:100DE00069F030F4803259F0833269F420612CC00C -:100DF0008D3239F0803339F4216026C022602460BE -:100E000023C0286021C027FD27C030ED380F3A30BD -:100E100078F426FF06C0FAE05F9E300D1124532EB1 -:100E200013C08AE0389E300D1124332E20620CC08E -:100E30008E3221F426FD6BC1206406C08C3611F47D -:100E4000206802C0883641F4F60193FD859193FF36 -:100E500081916F018111C1CF982F9F7D955493305F -:100E600028F40C5F1F4FFFE3F9830DC0833631F088 -:100E7000833771F0833509F05BC022C0F8018081AF -:100E800089830E5F1F4F44244394512C540115C095 -:100E90003801F2E06F0E711CF801A080B18026FFCE -:100EA00003C0652D70E002C06FEF7FEFC5012C8796 -:100EB0000E949C082C0183012C852F77222E17C0BD -:100EC0003801F2E06F0E711CF801A080B18026FF9E -:100ED00003C0652D70E002C06FEF7FEFC5012C8766 -:100EE0000E9491082C012C852068222E830123FC6E -:100EF0001BC0832D90E048165906B0F4B70180E27C -:100F000090E00E94A7083A94F4CFF50127FC859160 -:100F100027FE81915F01B70190E00E94A708311080 -:100F20003A94F1E04F1A51084114510471F7E5C0A9 -:100F3000843611F0893639F5F80127FF07C0608142 -:100F40007181828193810C5F1F4F08C06081718124 -:100F5000882777FD8095982F0E5F1F4F2F76B22E32 -:100F600097FF09C090958095709561957F4F8F4F41 -:100F70009F4F2068B22E2AE030E0A4010E94D908D9 -:100F8000A82EA81844C0853729F42F7EB22E2AE057 -:100F900030E025C0F22FF97FBF2E8F36C1F018F454 -:100FA000883579F0B4C0803719F0883721F0AFC0A8 -:100FB0002F2F2061B22EB4FE0DC08B2D8460B82E71 -:100FC00009C024FF0AC09F2F9660B92E06C028E0F2 -:100FD00030E005C020E130E002C020E132E0F8015D -:100FE000B7FE07C060817181828193810C5F1F4FC2 -:100FF00006C06081718180E090E00E5F1F4FA40108 -:101000000E94D908A82EA818FB2DFF77BF2EB6FE88 -:101010000BC02B2D2E7FA51450F4B4FE0AC0B2FCD9 -:1010200008C02B2D2E7E05C07A2C2B2D03C07A2CC8 -:1010300001C0752C24FF0DC0FE01EA0DF11D808159 -:10104000803311F4297E09C022FF06C07394739483 -:1010500004C0822F867809F0739423FD13C020FF0B -:1010600006C05A2C731418F4530C5718732C7314AD -:1010700068F4B70180E290E02C870E94A70873947F -:101080002C85F5CF731410F4371801C0312C24FFD0 -:1010900012C0B70180E390E02C870E94A7082C853E -:1010A00022FF17C021FF03C088E590E002C088E757 -:1010B00090E0B7010CC0822F867859F021FD02C064 -:1010C00080E201C08BE227FD8DE2B70190E00E9433 -:1010D000A708A51438F4B70180E390E00E94A708A0 -:1010E0005A94F7CFAA94F401EA0DF11D8081B7015B -:1010F00090E00E94A708A110F5CF332009F451CE4B -:10110000B70180E290E00E94A7083A94F6CFF70179 -:101110008681978102C08FEF9FEF2C96E2E10C94BD -:101120005309FC010590615070400110D8F780957B -:1011300090958E0F9F1F0895FC01615070400190A3 -:101140000110D8F7809590958E0F9F1F08950F93EB -:101150001F93CF93DF93182F092FEB018B8181FD14 -:1011600003C08FEF9FEF20C082FF10C04E815F81D0 -:101170002C813D81421753077CF4E881F9819F015E -:101180002F5F3F4F39832883108306C0E885F98598 -:10119000812F0995892B29F72E813F812F5F3F4FA2 -:1011A0003F832E83812F902FDF91CF911F910F913D -:1011B0000895FA01AA27283051F1203181F1E894ED -:1011C0006F936E7F6E5F7F4F8F4F9F4FAF4FB1E03A -:1011D0003ED0B4E03CD0670F781F891F9A1FA11D35 -:1011E000680F791F8A1F911DA11D6A0F711D811D36 -:1011F000911DA11D20D009F468943F912AE0269FFB -:1012000011243019305D3193DEF6CF010895462F59 -:101210004770405D4193B3E00FD0C9F7F6CF462F3A -:101220004F70405D4A3318F0495D31FD40524193A3 -:1012300002D0A9F7EACFB4E0A69597958795779560 -:101240006795BA95C9F700976105710508959B01E7 -:10125000AC010A2E06945795479537952795BA9570 -:10126000C9F7620F731F841F951FA01D08952F9249 -:101270003F924F925F926F927F928F929F92AF9226 -:10128000BF92CF92DF92EF92FF920F931F93CF9373 -:10129000DF93CDB7DEB7CA1BDB0B0FB6F894DEBF0A -:1012A0000FBECDBF09942A88398848885F846E8430 -:1012B0007D848C849B84AA84B984C884DF80EE807A -:1012C000FD800C811B81AA81B981CE0FD11D0FB683 -:1012D000F894DEBF0FBECDBFED010895F894FFCFA7 -:1012E0004A756C20313820323031350076312E305D -:1012F00000090920202020204669726D77617265FF -:101300002025732C2025730D0A0D0A000D0A2D2DA2 -:101310002D2D2D0D0A00202020464D20696E2075B0 -:1013200073653A20200D0A00202020566F6C756DE1 -:10133000653A20200020202042616C616E63653A8E -:10134000202000202020466164653A2020002020D3 -:1013500020426173733A202000202020547265627D -:101360006C653A202000202020414D20696E2075B8 -:1013700073653A20200D0A00202020464D20467239 -:10138000657175656E63793A202020202020202029 -:10139000202020002558200020202042726F616408 -:1013A000636173743A2020202020202564200D0AD8 -:1013B000002020204D617374657220616464726541 -:1013C00073733A2030782558200D0A0020202053CE -:1013D0006C61766520616464726573733A202030B5 -:1013E000782558200D0A00202020436F6E74726FFC -:1013F0006C3A202020202020202030782558200DF5 -:101400000A00202020446174612073697A653A20C3 -:1014100020202020202564200D0A00202020446167 -:1014200074613A202020202020202020202000410C -:101430007663526561644D6573736167653A2050E8 -:101440006172697479206572726F72204020446104 -:0A14500074615B25645D0D0A000065 -:00000001FF diff --git a/ToyotaAuxEnabler.o b/ToyotaAuxEnabler.o deleted file mode 100644 index 308da1d44f667fda1341e1088c0be699c297b8ca..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8856 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 W;{r@Ng)9B<>mx(Z4&&%m^#20l)Yaes diff --git a/USART.o b/USART.o deleted file mode 100644 index ce056e282f7350852ff34e4f386f5d4de11d61dc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7936 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 V$(8e9llCRK<=~N}`XMLIe*uvd!oC0i diff --git a/avclandrv.c b/avclandrv.c index 611045b..e55d1d1 100644 --- a/avclandrv.c +++ b/avclandrv.c @@ -29,7 +29,8 @@ #include #include -//#include // Unnecessary? +#include + #include "avclandrv.h" #include "com232.h" #include "GlobalDef.h" @@ -63,6 +64,21 @@ byte cd_Time_Sec; byte answerReq; +cd_modes CD_Mode; + + +byte broadcast; +byte master1; +byte master2; +byte slave1; +byte slave2; +byte message_len; +byte message[MAXMSGLEN]; + +byte data_control; +byte data_len; +byte data[MAXMSGLEN]; + // we need check answer (to avclan check) timeout // when is more then 1 min, FORCE answer. byte check_timeout; @@ -75,10 +91,6 @@ const byte stat2[] = { 0x4, 0x00, 0x00, 0x01, 0x08 }; const byte stat3[] = { 0x4, 0x00, 0x00, 0x01, 0x0D }; const byte stat4[] = { 0x4, 0x00, 0x00, 0x01, 0x0C }; -// Updated avclandrv.c had these -const u08 stat5[] = { 0x6, 0x00, 0x12, 0x5C, 0x43, 0x02, 0x00 }; -const u08 stat6[] = { 0x4, 0x00, 0x58, 0x63, 0xE0 }; - // broadcast const byte lan_stat1[] = { 0x3, 0x00, 0x01, 0x0A }; const byte lan_reg[] = { 0x3, SW_ID, 0x01, 0x00 }; @@ -274,8 +286,6 @@ void AVCLan_Send_Bit0() //------------------------------------------------------------------------------ byte AVCLan_Read_ACK() { - byte time = 0; - AVC_SET_1(); TCNT0 = 0; while( TCNT0 < 39 ); @@ -288,8 +298,7 @@ byte AVCLan_Read_ACK() AVC_OUT_DIS(); // switch to read mode TCNT0 = 1; while(1) { - time = TCNT0; - if (INPUT_IS_SET && (TCNT0 > 1)) break; + if (INPUT_IS_SET && (TCNT0 > 2)) break; if (TCNT0 > 41) return 1; // Not sure if this fix is intent correct } @@ -343,7 +352,7 @@ byte AVCLan_Send_Byte(byte bite, byte len) } len--; if (!len) { - //if (INPUT_IS_SET) RS232_Print("SBER\n"); // Send Bit ERror + //if (INPUT_IS_SET) RS232_S((unsigned char)PSTR("SBER\n")); // Send Bit ERror return 1; } b = b << 1; @@ -392,14 +401,14 @@ byte AVCLan_Read_Message() byte i; byte for_me = 0; - //RS232_Print("$ "); + //RS232_S((unsigned char)PSTR("$ ")); // check start bit TCNT0 = 0; while (INPUT_IS_SET) { if ( TCNT0 > 2286 ) { // Originally 254 STARTEvent; - RS232_Print("LAN>T1\n"); + RS232_S((unsigned char)PSTR("LAN>T1\n")); return 0; } } @@ -407,7 +416,7 @@ byte AVCLan_Read_Message() if ( TCNT0 < 90 ) { // !!!!!!! 20 !!!!!!!!!!! (Originally 10) STARTEvent; - RS232_Print("LAN>T2\n"); + RS232_S((unsigned char)PSTR("LAN>T2\n")); return 0; } @@ -457,7 +466,7 @@ byte AVCLan_Read_Message() else AVCLan_Read_Byte(1); if (message_len > MAXMSGLEN) { -// RS232_Print("LAN> Command error"); +// RS232_S((unsigned char)PSTR("LAN> Command error")); STARTEvent; return 0; } @@ -553,7 +562,7 @@ byte AVCLan_SendData() if (AVCLan_Read_ACK()) { AVC_OUT_DIS(); STARTEvent; - RS232_Print("E1\n"); + RS232_S((unsigned char)PSTR("E1\n")); return 1; } @@ -563,7 +572,7 @@ byte AVCLan_SendData() if (AVCLan_Read_ACK()) { AVC_OUT_DIS(); STARTEvent; - RS232_Print("E2\n"); + RS232_S((unsigned char)PSTR("E2\n")); return 2; } @@ -572,7 +581,7 @@ byte AVCLan_SendData() if (AVCLan_Read_ACK()) { AVC_OUT_DIS(); STARTEvent; - RS232_Print("E3\n"); + RS232_S((unsigned char)PSTR("E3\n")); return 3; } @@ -582,9 +591,9 @@ byte AVCLan_SendData() if (AVCLan_Read_ACK()) { AVC_OUT_DIS(); STARTEvent; - RS232_Print("E4("); + RS232_S((unsigned char)PSTR("E4(")); RS232_PrintDec(i); - RS232_Print(")\n"); + RS232_S((unsigned char)PSTR(")\n")); return 4; } } @@ -776,13 +785,13 @@ byte AVCLan_SendAnswer() break; case cmRegister: r = AVCLan_SendAnswerFrame((byte*)CMD_REGISTER); break; - case cmInit: //RS232_Print("INIT\n"); + case cmInit: //RS232_S((unsigned char)PSTR("INIT\n")); r = AVCLan_SendInitCommands(); break; case cmCheck: r = AVCLan_SendAnswerFrame((byte*)CMD_CHECK); check_timeout = 0; CMD_CHECK[6]++; - RS232_Print("AVCCHK\n"); + RS232_S((unsigned char)PSTR("AVCCHK\n")); break; case cmPlayReq1: playMode = 0; r = AVCLan_SendAnswerFrame((byte*)CMD_PLAY_OK1); @@ -794,7 +803,7 @@ byte AVCLan_SendAnswer() CD_Mode = stPlay; break; case cmPlayIt: playMode = 1; - RS232_Print("PLAY\n"); + RS232_S((unsigned char)PSTR("PLAY\n")); CMD_PLAY_OK4[7]=cd_Disc; CMD_PLAY_OK4[8]=cd_Track; CMD_PLAY_OK4[9]=cd_Time_Min; @@ -826,9 +835,9 @@ byte AVCLan_SendAnswer() //------------------------------------------------------------------------------ void AVCLan_Register() { - RS232_Print("REG_ST\n"); + RS232_S((unsigned char)PSTR("REG_ST\n")); AVCLan_SendAnswerFrame((byte*)CMD_REGISTER); - RS232_Print("REG_END\n"); + RS232_S((unsigned char)PSTR("REG_END\n")); //AVCLan_Command( cmRegister ); AVCLan_Command( cmInit ); } @@ -842,9 +851,9 @@ byte AVCLan_Command(byte command) answerReq = command; r = AVCLan_SendAnswer(); /* - RS232_Print("ret="); + RS232_S((unsigned char)PSTR("ret=")); RS232_PrintHex8(r); - RS232_Print("\n"); + RS232_S((unsigned char)PSTR("\n")); */ return r; } @@ -876,7 +885,7 @@ byte HexDec(byte data) byte Dec2Toy(byte data) { byte d,d1; - d = (u32)data/(u32)10; + d = (unsigned int)data/(unsigned int)10; d1 = d * 16; d = d1 + (data - 10*d); return d; @@ -891,24 +900,24 @@ void ShowInMessage() AVC_HoldLine(); - RS232_S((u16)PSTR("HU < (")); + RS232_S((unsigned char)PSTR("HU < (")); - if (broadcast==0) RS232_S((u16)PSTR("bro) ")); - else RS232_Print("dir) "); + if (broadcast==0) RS232_S((unsigned char)PSTR("bro) ")); + else RS232_S((unsigned char)PSTR("dir) ")); RS232_PrintHex4(master1); RS232_PrintHex8(master2); - RS232_Print("| "); + RS232_S((unsigned char)PSTR("| ")); RS232_PrintHex4(slave1); RS232_PrintHex8(slave2); - RS232_Print("| "); + RS232_S((unsigned char)PSTR("| ")); byte i; for (i=0;i ")); + RS232_S((unsigned char)PSTR("out > ")); for (i=0; i #include "com232.h" +byte RS232_RxCharBuffer[25], RS232_RxCharBegin, RS232_RxCharEnd; +byte readkey; //------------------------------------------------------------------------------ void RS232_Init(void) @@ -42,25 +44,25 @@ void RS232_Init(void) UCSR0A = 0; UCSR0B = ((1< '9') Character += 'A' - '0' - 10; RS232_SendByte(Character); } //------------------------------------------------------------------------------ -void RS232_PrintHex8(u08 Data) +void RS232_PrintHex8(byte Data) { RS232_PrintHex4(Data >> 4); RS232_PrintHex4(Data); } //------------------------------------------------------------------------------ -void RS232_PrintDec(u08 Data) +void RS232_PrintDec(byte Data) { if (Data>99) { RS232_SendByte('*'); @@ -105,8 +107,8 @@ void RS232_PrintDec(u08 Data) RS232_SendByte('0'+Data); return; } - u08 c; - u16 v,v1; + byte c; + unsigned short v,v1; v = Data; v1 = v/10; c = '0' + (v-v1*10); @@ -114,7 +116,7 @@ void RS232_PrintDec(u08 Data) RS232_SendByte(c); } //------------------------------------------------------------------------------ -void RS232_PrintDec2(u08 Data) +void RS232_PrintDec2(byte Data) { if (Data<10) RS232_SendByte('0'); RS232_PrintDec(Data); diff --git a/com232.h b/com232.h index bd5a2f5..a1c0a24 100644 --- a/com232.h +++ b/com232.h @@ -28,22 +28,22 @@ #define __COM232_H //------------------------------------------------------------------------------ -#include "const.h" +#include "GlobalDef.h" //------------------------------------------------------------------------------ -u08 RS232_RxCharBuffer[25], RS232_RxCharBegin, RS232_RxCharEnd; -u08 readkey; +extern byte RS232_RxCharBuffer[25], RS232_RxCharBegin, RS232_RxCharEnd; +extern byte readkey; //------------------------------------------------------------------------------ void RS232_Init(void); -extern void RS232_S(u16 str_addr); -extern void RS232_SendByte(u08 Data); +extern void RS232_S(unsigned short str_addr); +extern void RS232_SendByte(byte Data); extern void RS232_Print(char* pBuf); -extern void RS232_PrintHex4(u08 Data); -extern void RS232_PrintHex8(u08 Data); -extern void RS232_PrintDec(u08 Data); -extern void RS232_PrintDec2(u08 Data); +extern void RS232_PrintHex4(byte Data); +extern void RS232_PrintHex8(byte Data); +extern void RS232_PrintDec(byte Data); +extern void RS232_PrintDec2(byte Data); //------------------------------------------------------------------------------ // LED diff --git a/sniffer.c b/sniffer.c index ab5a051..3b3fde0 100644 --- a/sniffer.c +++ b/sniffer.c @@ -66,16 +66,16 @@ int main() - RS232_S((u16)PSTR("AVCLan reader 1.00\nReady\n\n")); + RS232_S((unsigned char)PSTR("AVCLan reader 1.00\nReady\n\n")); LED_OFF(); - RS232_S((u16)PSTR("T - device id\n")); - RS232_S((u16)PSTR("H - HU id\n")); - RS232_S((u16)PSTR("S - read sequence\n")); - RS232_S((u16)PSTR("W - send command\n")); - RS232_S((u16)PSTR("Q - send broadcast\n")); - RS232_S((u16)PSTR("L/l - log on/off\n")); - RS232_S((u16)PSTR("K/k - seq. echo on/off\n")); - RS232_S((u16)PSTR("R/r - register device\n")); + RS232_S((unsigned char)PSTR("T - device id\n")); + RS232_S((unsigned char)PSTR("H - HU id\n")); + RS232_S((unsigned char)PSTR("S - read sequence\n")); + RS232_S((unsigned char)PSTR("W - send command\n")); + RS232_S((unsigned char)PSTR("Q - send broadcast\n")); + RS232_S((unsigned char)PSTR("L/l - log on/off\n")); + RS232_S((unsigned char)PSTR("K/k - seq. echo on/off\n")); + RS232_S((unsigned char)PSTR("R/r - register device\n")); @@ -111,15 +111,15 @@ int main() case 'T': if (readSeq) { CD_ID_1 = data_tmp[0]; CD_ID_2 = data_tmp[1]; - RS232_Print("DEV ID SET: 0x"); + RS232_S((unsigned char)PSTR("DEV ID SET: 0x")); RS232_PrintHex8(CD_ID_1); RS232_PrintHex8(CD_ID_2); - RS232_Print("\n"); + RS232_S((unsigned char)PSTR("\n")); showLog = 1; readSeq=0; } else { showLog = 0; - RS232_Print("DEV ID > \n"); + RS232_S((unsigned char)PSTR("DEV ID > \n")); readSeq = 1; s_len=0; s_dig=0; @@ -130,15 +130,15 @@ int main() case 'H': if (readSeq) { HU_ID_1 = data_tmp[0]; HU_ID_2 = data_tmp[1]; - RS232_Print("HU ID SET: 0x"); + RS232_S((unsigned char)PSTR("HU ID SET: 0x")); RS232_PrintHex8(HU_ID_1); RS232_PrintHex8(HU_ID_2); - RS232_Print("\n"); + RS232_S((unsigned char)PSTR("\n")); showLog = 1; readSeq=0; } else { showLog = 0; - RS232_Print("HU ID > \n"); + RS232_S((unsigned char)PSTR("HU ID > \n")); readSeq = 1; s_len=0; s_dig=0; @@ -147,7 +147,7 @@ int main() break; case 'S': showLog = 0; - RS232_Print("READ SEQUENCE > \n"); + RS232_S((unsigned char)PSTR("READ SEQUENCE > \n")); readSeq = 1; s_len=0; s_dig=0; @@ -163,7 +163,7 @@ int main() break; - case 'R': RS232_Print("REGIST:\n"); + case 'R': RS232_S((unsigned char)PSTR("REGIST:\n")); AVCLan_Command( cmRegister ); TCNT0 = 0; while( TCNT0 < 135 ); @@ -173,17 +173,17 @@ int main() break; - case 'l': RS232_Print("Log OFF\n"); + case 'l': RS232_S((unsigned char)PSTR("Log OFF\n")); showLog = 0; break; - case 'L': RS232_Print("Log ON\n"); + case 'L': RS232_S((unsigned char)PSTR("Log ON\n")); showLog = 1; break; - case 'k': RS232_Print("str OFF\n"); + case 'k': RS232_S((unsigned char)PSTR("str OFF\n")); showLog2 = 0; break; - case 'K': RS232_Print("str ON\n"); + case 'K': RS232_S((unsigned char)PSTR("str ON\n")); showLog2 = 1; break; @@ -204,12 +204,12 @@ int main() s_c[0]=s_c[1]=0; } if (showLog2) { - RS232_Print("CURRENT SEQUENCE > "); + RS232_S((unsigned char)PSTR("CURRENT SEQUENCE > ")); for (i=0; i