diff --git a/AvrUartBaud.c b/AvrUartBaud.c index 861fa4f..73dcd8f 100644 --- a/AvrUartBaud.c +++ b/AvrUartBaud.c @@ -6,7 +6,7 @@ /*********************************************************************************/ #include "AvrUartBaud.h" /*********************************************************************************/ -#if(AVR_UART_BAUD_REVISION_DATE != 20161108) +#if(AVR_UART_BAUD_REVISION_DATE != 20170601) #error wrong include file. (AvrUartBaud.h) #endif /*********************************************************************************/ @@ -14,7 +14,7 @@ /*********************************************************************************/ -char AvrUartBaudControlInit(tag_UartBaudControl *BaudCtrl, long CpuClock, unsigned char volatile __tiny *pUBRRL, unsigned char volatile __tiny *pUBRRH) +char AvrUartBaudControlInit(tag_UartBaudControl *BaudCtrl, long CpuClock, char *pUBRRL, char *pUBRRH) { /* 1) Parameter diff --git a/AvrUartBaud.h b/AvrUartBaud.h index b46d281..866865a 100644 --- a/AvrUartBaud.h +++ b/AvrUartBaud.h @@ -7,15 +7,18 @@ #ifndef __AVR_UART_BAUD_H__ #define __AVR_UART_BAUD_H__ /*********************************************************************************/ -#define AVR_UART_BAUD_REVISION_DATE 20161108 +#define AVR_UART_BAUD_REVISION_DATE 20170601 /*********************************************************************************/ /** REVISION HISTORY **/ /* + 2017. 06. 01. - AvrUartBaudControlInit() 함수의 인수 pUBRRL, pUBRRH 타입을 아래와 같이 변경. + Jeong Hyun Gu 'unsigned char volatile __tiny *' -> 'char *' + 2016. 11. 08. - revision valid check 추가. - Jung Hyun Gu + Jeong Hyun Gu 2016. 10. 28. - 초기버전. - Jung Hyun Gu + Jeong Hyun Gu */ /*********************************************************************************/ /**Define**/ @@ -50,8 +53,8 @@ typedef struct }Bit; - unsigned char volatile __tiny *pUBRRL; // - unsigned char volatile __tiny *pUBRRH; // + char *pUBRRL; + char *pUBRRH; long CpuClock; //CPU클록 Enum_BaudRate Baud; // @@ -60,7 +63,7 @@ typedef struct /*********************************************************************************/ /**Function**/ -char AvrUartBaudControlInit(tag_UartBaudControl *BaudCtrl, long CpuClock, unsigned char volatile __tiny *pUBRRL, unsigned char volatile __tiny *pUBRRH); +char AvrUartBaudControlInit(tag_UartBaudControl *BaudCtrl, long CpuClock, char *pUBRRL, char *pUBRRH); void AvrUartBaudChange(tag_UartBaudControl *BaudCtrl, Enum_BaudRate Baud); /*********************************************************************************/ diff --git a/example/AvrUartBaud.dep b/example/AvrUartBaud.dep index 24ac81a..d67a9d9 100644 --- a/example/AvrUartBaud.dep +++ b/example/AvrUartBaud.dep @@ -6,78 +6,59 @@ Debug - $PROJ_DIR$\main.c + $TOOLKIT_DIR$\inc\bitdefinitions\iom64.inc + $PROJ_DIR$\Debug\Obj\AvrUartBaud.pbi + $TOOLKIT_DIR$\lib\clib\cl3s-ec_mul-sf.r90 + $PROJ_DIR$\..\AvrUartBaud.c $PROJ_DIR$\Debug\Obj\main.r90 - $PROJ_DIR$\Debug\Exe\AvrUartBaud.d90 - $PROJ_DIR$\Debug\Obj\AvrUartBaud.pbd - $PROJ_DIR$\Debug\Obj\main.pbi - $TOOLKIT_DIR$\inc\comp_a90.h - $TOOLKIT_DIR$\inc\intrinsics.h $TOOLKIT_DIR$\inc\inavr.h - $PROJ_DIR$\Debug\Obj\AvrUartBaud.r90 $PROJ_DIR$\..\AvrUartBaud.h $TOOLKIT_DIR$\inc\iom64.h + $TOOLKIT_DIR$\inc\intrinsics.h $TOOLKIT_DIR$\inc\iomacro.h + $PROJ_DIR$\main.c + $PROJ_DIR$\Debug\Obj\AvrUartBaud.pbd + $PROJ_DIR$\Debug\Obj\AvrUartBaud.r90 + $TOOLKIT_DIR$\inc\comp_a90.h + $TOOLKIT_DIR$\config\lnkm64s.xcl $PROJ_DIR$\Debug\Exe\AvrUartBaud(AT64).d90 $TOOLKIT_DIR$\inc\ina90.h - $TOOLKIT_DIR$\config\lnkm64s.xcl - $TOOLKIT_DIR$\lib\clib\cl3s-ec_mul-sf.r90 - $PROJ_DIR$\..\AvrUartBaud.c - $PROJ_DIR$\Debug\Obj\AvrUartBaud.pbi - $TOOLKIT_DIR$\inc\bitdefinitions\iom64.inc + $PROJ_DIR$\Debug\Obj\main.pbi [ROOT_NODE] XLINK - 12 + 15 - $PROJ_DIR$\main.c + $PROJ_DIR$\..\AvrUartBaud.c BICOMP - 4 + 1 ICCAVR - 1 + 12 BICOMP - 10 11 18 13 7 6 5 + 6 ICCAVR - 10 11 18 13 7 6 5 9 - - - - - $PROJ_DIR$\Debug\Obj\AvrUartBaud.pbd - - - BILINK - 17 4 - - - - - $PROJ_DIR$\Debug\Exe\AvrUartBaud(AT64).d90 - - - XLINK - 14 8 1 15 + 6 - $PROJ_DIR$\..\AvrUartBaud.c + $PROJ_DIR$\main.c BICOMP @@ -85,17 +66,35 @@ ICCAVR - 8 + 4 BICOMP - 9 + 7 9 0 16 5 8 13 6 ICCAVR - 9 + 7 9 0 16 5 8 13 6 + + + + + $PROJ_DIR$\Debug\Obj\AvrUartBaud.pbd + + + BILINK + 1 17 + + + + + $PROJ_DIR$\Debug\Exe\AvrUartBaud(AT64).d90 + + + XLINK + 14 12 4 2 @@ -106,64 +105,49 @@ Release - $PROJ_DIR$\main.c - $PROJ_DIR$\Release\Obj\AvrUartBaud.r90 - $PROJ_DIR$\Release\Obj\AvrUartBaud.pbi + $TOOLKIT_DIR$\inc\bitdefinitions\iom64.inc $PROJ_DIR$\Release\Exe\AvrUartBaud(AT64).hex - $TOOLKIT_DIR$\inc\comp_a90.h - $TOOLKIT_DIR$\inc\intrinsics.h + $PROJ_DIR$\Release\Obj\AvrUartBaud.pbi + $PROJ_DIR$\Release\Obj\AvrUartBaud.pbd + $TOOLKIT_DIR$\lib\clib\cl3s-ec_mul-sf.r90 + $PROJ_DIR$\Release\Obj\AvrUartBaud.r90 + $PROJ_DIR$\Release\Obj\main.pbi + $PROJ_DIR$\Release\Obj\main.r90 + $PROJ_DIR$\..\AvrUartBaud.c $TOOLKIT_DIR$\inc\inavr.h $PROJ_DIR$\..\AvrUartBaud.h $TOOLKIT_DIR$\inc\iom64.h + $TOOLKIT_DIR$\inc\intrinsics.h $TOOLKIT_DIR$\inc\iomacro.h - $TOOLKIT_DIR$\inc\ina90.h - $PROJ_DIR$\Release\Obj\main.r90 + $PROJ_DIR$\main.c + $TOOLKIT_DIR$\inc\comp_a90.h $TOOLKIT_DIR$\config\lnkm64s.xcl - $PROJ_DIR$\Release\Obj\main.pbi - $TOOLKIT_DIR$\lib\clib\cl3s-ec_mul-sf.r90 - $PROJ_DIR$\..\AvrUartBaud.c - $PROJ_DIR$\Release\Obj\AvrUartBaud.pbd - $TOOLKIT_DIR$\inc\bitdefinitions\iom64.inc - $PROJ_DIR$\Release\Exe\AvrUartBaud.hex + $TOOLKIT_DIR$\inc\ina90.h [ROOT_NODE] XLINK - 3 + 1 - $PROJ_DIR$\main.c - - - BICOMP - 13 - - - ICCAVR - 11 - - + $PROJ_DIR$\Release\Exe\AvrUartBaud(AT64).hex - BICOMP - 8 9 17 10 6 5 4 - - - ICCAVR - 8 9 17 10 6 5 4 7 + XLINK + 16 5 7 4 - $PROJ_DIR$\Release\Exe\AvrUartBaud(AT64).hex + $PROJ_DIR$\Release\Obj\AvrUartBaud.pbd - XLINK - 12 1 11 14 + BILINK + 2 6 @@ -176,26 +160,40 @@ ICCAVR - 1 + 5 BICOMP - 7 + 10 ICCAVR - 7 + 10 - $PROJ_DIR$\Release\Obj\AvrUartBaud.pbd + $PROJ_DIR$\main.c + + + BICOMP + 6 + + + ICCAVR + 7 + + - BILINK - 2 13 + BICOMP + 11 13 0 17 9 12 15 10 + + + ICCAVR + 11 13 0 17 9 12 15 10 diff --git a/example/Debug/Exe/AvrUartBaud(AT64).d90 b/example/Debug/Exe/AvrUartBaud(AT64).d90 index 6ca3472..200bd51 100644 Binary files a/example/Debug/Exe/AvrUartBaud(AT64).d90 and b/example/Debug/Exe/AvrUartBaud(AT64).d90 differ diff --git a/example/Debug/Obj/AvrUartBaud.pbd b/example/Debug/Obj/AvrUartBaud.pbd new file mode 100644 index 0000000..f5af8a0 --- /dev/null +++ b/example/Debug/Obj/AvrUartBaud.pbd @@ -0,0 +1,4 @@ +This is an internal working file generated by the Source Browser. +16:41 27s +F:\Github\AvrUartBaud\example\Debug\Obj\AvrUartBaud.pbi +F:\Github\AvrUartBaud\example\Debug\Obj\main.pbi diff --git a/example/Debug/Obj/AvrUartBaud.r90 b/example/Debug/Obj/AvrUartBaud.r90 index 9f77839..134edfb 100644 Binary files a/example/Debug/Obj/AvrUartBaud.r90 and b/example/Debug/Obj/AvrUartBaud.r90 differ diff --git a/example/Debug/Obj/main.r90 b/example/Debug/Obj/main.r90 index 7224b29..38b3a92 100644 Binary files a/example/Debug/Obj/main.r90 and b/example/Debug/Obj/main.r90 differ diff --git a/example/Release/Exe/AvrUartBaud(AT64).hex b/example/Release/Exe/AvrUartBaud(AT64).hex index 7b92dfc..f04eb6d 100644 --- a/example/Release/Exe/AvrUartBaud(AT64).hex +++ b/example/Release/Exe/AvrUartBaud(AT64).hex @@ -1,5 +1,5 @@ :020000020000FC -:100000000C944501189518951895189518951895FC +:100000000C945301189518951895189518951895EE :100010001895189518951895189518951895189578 :100020001895189518951895189518951895189568 :100030001895189518951895189518951895189558 @@ -7,56 +7,58 @@ :100050001895189518951895189518951895189538 :100060001895189518951895189518951895189528 :100070001895189518951895189518951895189518 -:100080001895189518951895189518950800000159 -:100090000000F801222311F0332311F400E0089549 -:1000A000438354836583768305E00783218332830A -:1000B00000810160008301E008950E949C01D80145 -:1000C0000C9100FFCCC0FD010781021709F4C7C0E5 -:1000D0002783215071F12A9509F450C02A9509F41B -:1000E00072C02A95038114812581368140E150E058 -:1000F00060E070E009F48DC00E947A0140E855E2AA -:1001000060E070E00E947A01C8010197FD01028160 -:10011000E02FF0E09083FD01038114812581368179 -:1001200040E150E060E070E00E947A0140E855E272 -:100130006EC0038114812581368140E150E060E08A -:1001400070E00E947A0140E05BE460E070E00E94B1 -:100150007A01C8010197FD010281E02FF0E0908350 -:10016000FD01038114812581368140E150E060E08A -:1001700070E00E947A0140E05BE449C00381148191 -:100180002581368140E150E060E070E00E947A0114 -:1001900040E056E960E070E00E947A01C8010197F2 -:1001A000FD010281E02FF0E09083FD0103811481C5 -:1001B0002581368140E150E060E070E00E947A01E4 -:1001C00040E056E924C0038114812581368140E155 -:1001D00050E060E070E00E947A0140E051EE60E0A3 -:1001E00070E00E947A01C8010197FD010281E02FB1 -:1001F000F0E09083FD01038114812581368140E187 -:1002000050E060E070E00E947A0140E051EE60E072 -:100210001DC00E947A0140E052EC61E070E00E9453 -:100220007A01C8010197FD010281E02FF0E090837F -:10023000FD01038114812581368140E150E060E0B9 -:1002400070E00E947A0140E052EC61E070E00E94B0 -:100250007A010A95FD011181E12FF0E00083E4E0CD -:100260000C94A10130E929E240E050E061EE70E039 -:1002700000E011E00E94490020E000E011E00E944F -:100280005D00FACF00008895FECF07E40DBF01E0C6 -:100290000EBFC8E4D3E00E94AA01002311F00E941F -:1002A000BA010E9432010E9442010C9442010024D2 -:1002B00011241001E0E2EA9592F0001F111F221FA5 -:1002C000331F001C111C221C331C041615062606A5 -:1002D000370688F3041A150A260A370AECCF001FDE -:1002E000111F221F331FA001B10100951095209509 -:1002F00030950895FF27772312F4F16015D033234A -:1003000012F4F09509D00E945701F69508F404D034 -:10031000F69508F409C0089530952095109501953B -:100320001F4F2F4F3F4F0895709560955095419501 -:100330005F4F6F4F7F4F0895BA93AA939A938A9312 -:100340000895BB81AA8199818881F0E0EC0FFD1F9F -:10035000EF01089501E0089520E006D0E9F708953F -:10036000259102D0E9F708952D9301501040202FD8 -:10037000212B08958CE890E0FC0105911491FC017B -:100380003296A591B491FC01349625913491422F77 -:10039000432B19F0F901E4DF01C0DEDF069610E01F -:0803A0008239910748F308952A +:100080001895189518951895189518950A00000157 +:1000900000001B2E2A2EF80108811981022E032A46 +:1000A00019F0002E012A11F400E00EC0458356839A +:1000B0006783708745E041872183328303831483FC +:1000C00000810160008301E0A22DB12D22960895E8 +:1000D0000E94AA01D8010C9100FFCBC0FD0101854F +:1000E000021709F4C6C02187215071F12A9509F43D +:1000F00050C02A9509F472C02A950581168127817E +:10010000308540E150E060E070E009F48DC00E946D +:10011000880140E855E260E070E00E948801C80173 +:100120000197FD0103811481F8019083FD01058190 +:1001300016812781308540E150E060E070E00E9448 +:10014000880140E855E26EC005811681278130851F +:1001500040E150E060E070E00E94880140E05BE434 +:1001600060E070E00E948801C8010197FD010381F1 +:100170001481F8019083FD01058116812781308566 +:1001800040E150E060E070E00E94880140E05BE404 +:1001900049C0058116812781308540E150E060E04B +:1001A00070E00E94880140E056E960E070E00E9443 +:1001B0008801C8010197FD0103811481F801908332 +:1001C000FD01058116812781308540E150E060E026 +:1001D00070E00E94880140E056E924C00581168144 +:1001E0002781308540E150E060E070E00E948801A6 +:1001F00040E051EE60E070E00E948801C801019784 +:10020000FD0103811481F8019083FD0105811681B0 +:100210002781308540E150E060E070E00E94880175 +:1002200040E051EE60E01DC00E94880140E052ECC9 +:1002300061E070E00E948801C8010197FD0103811F +:100240001481F8019083FD01058116812781308595 +:1002500040E150E060E070E00E94880140E052EC34 +:1002600061E070E00E9488010A95FD01A181B281E0 +:100270000C93E4E00C94AF0100E910E01A930A93A8 +:1002800029E230E040E050E061EE70E000E011E093 +:100290000E94490020E000E011E00E946800FACFCF +:1002A00000008895FECF09E40DBF01E00EBFCAE44F +:1002B000D3E00E94B801002311F00E94C8010E94FF +:1002C0003C010E9450010C945001002411241001A3 +:1002D000E0E2EA9592F0001F111F221F331F001C5D +:1002E000111C221C331C041615062606370688F33B +:1002F000041A150A260A370AECCF001F111F221F05 +:10030000331FA001B10100951095209530950895F7 +:10031000FF27772312F4F16015D0332312F4F09500 +:1003200009D00E946501F69508F404D0F69508F40A +:1003300009C0089530952095109501951F4F2F4FB6 +:100340003F4F089570956095509541955F4F6F4F61 +:100350007F4F0895BA93AA939A938A930895BB8185 +:10036000AA8199818881F0E0EC0FFD1FEF010895CB +:1003700001E0089520E006D0E9F70895259102D024 +:10038000E9F708952D9301501040202F212B089557 +:100390008CE890E0FC0105911491FC013296A59146 +:1003A000B491FC01349625913491422F432B19F0DE +:1003B000F901E4DF01C0DEDF069610E08239910723 +:0403C00048F3089561 :0400000300000000F9 :00000001FF diff --git a/example/Release/Obj/AvrUartBaud.pbd b/example/Release/Obj/AvrUartBaud.pbd index 1c4fde1..21c4258 100644 --- a/example/Release/Obj/AvrUartBaud.pbd +++ b/example/Release/Obj/AvrUartBaud.pbd @@ -1,4 +1,4 @@ This is an internal working file generated by the Source Browser. -16:33 24s +16:41 30s F:\Github\AvrUartBaud\example\Release\Obj\AvrUartBaud.pbi F:\Github\AvrUartBaud\example\Release\Obj\main.pbi diff --git a/example/Release/Obj/AvrUartBaud.pbi b/example/Release/Obj/AvrUartBaud.pbi deleted file mode 100644 index e633eee..0000000 --- a/example/Release/Obj/AvrUartBaud.pbi +++ /dev/null @@ -1,22 +0,0 @@ -This is an internal working file generated by the Source Browser. -16:33 24s -F:\Github\AvrUartBaud\AvrUartBaud.c -F:\Github\AvrUartBaud\AvrUartBaud.c ---cpu=m64 --ms --o -F:\Github\AvrUartBaud\example\Release\Obj\ --D -NDEBUG --y ---initializers_in_flash ---no_inline ---no_cross_call ---no_tbaa --e --I -../\ ---eeprom_size -2048 ---clib --Om diff --git a/example/Release/Obj/AvrUartBaud.r90 b/example/Release/Obj/AvrUartBaud.r90 index 09571f9..1ef9e21 100644 Binary files a/example/Release/Obj/AvrUartBaud.r90 and b/example/Release/Obj/AvrUartBaud.r90 differ diff --git a/example/Release/Obj/main.pbi b/example/Release/Obj/main.pbi deleted file mode 100644 index 4dedb77..0000000 --- a/example/Release/Obj/main.pbi +++ /dev/null @@ -1,22 +0,0 @@ -This is an internal working file generated by the Source Browser. -16:33 24s -F:\Github\AvrUartBaud\example\main.c -F:\Github\AvrUartBaud\example\main.c ---cpu=m64 --ms --o -F:\Github\AvrUartBaud\example\Release\Obj\ --D -NDEBUG --y ---initializers_in_flash ---no_inline ---no_cross_call ---no_tbaa --e --I -../\ ---eeprom_size -2048 ---clib --Om diff --git a/example/Release/Obj/main.r90 b/example/Release/Obj/main.r90 index 32c6ade..c2eb509 100644 Binary files a/example/Release/Obj/main.r90 and b/example/Release/Obj/main.r90 differ diff --git a/example/main.c b/example/main.c index 64a796c..029b90a 100644 --- a/example/main.c +++ b/example/main.c @@ -8,7 +8,7 @@ tag_UartBaudControl Uart0Baud; void main( void ) { - AvrUartBaudControlInit(&Uart0Baud, __CPU_CLK__, &UBRR0L, &UBRR0H); + AvrUartBaudControlInit(&Uart0Baud, __CPU_CLK__, (char *) &UBRR0L, (char *) &UBRR0H); //init uart0 baudrate. while(1) diff --git a/example/settings/AvrUartBaud.wsdt b/example/settings/AvrUartBaud.wsdt index 6098a90..ce271cc 100644 --- a/example/settings/AvrUartBaud.wsdt +++ b/example/settings/AvrUartBaud.wsdt @@ -2,44 +2,41 @@ - - AvrUartBaud/Debug - - + + AvrUartBaud/Release - 261 - 27 - 27 - 27 - + + + + + 373272727 - 20 - 1395 - 372 - 93 - + + + + + 20139537293 - + + + TabID-7069-8589 Workspace Workspace - - AvrUartBaud - - + + AvrUartBaud - 0 - - + + 0 TabID-7362-8788 @@ -48,93 +45,21 @@ - 0 - - + + 0 - - - TextEditor - $WS_DIR$\main.c - 0 - 0 - 364 - 364 - - 0 - - 0 - - - 1000000 - 1000000 - - - 1 - + + + + + TextEditor$WS_DIR$\main.c0038338300100000010000001 - - - - - iaridepm.enu1 - - - - - - - - - - -2 - -2 - 754 - 335 - -2 - -2 - 200 - 200 - 104167 - 200602 - 175521 - 758275 - - - - - - - - - - - - - - - - -2 - -2 - 198 - 1922 - -2 - -2 - 1924 - 200 - 1002083 - 200602 - 104167 - 200602 - - - - - - - - - + + + + + + iaridepm.enu1-2-2682447-2-2267272139063272818233854686058-2-22701922-2-219242721002083272818139063272818