Skip to content

Commit

Permalink
Merge pull request #3 from TimerOverflow/20170601
Browse files Browse the repository at this point in the history 
20170601
  • Loading branch information
@TimerOverflow
TimerOverflow authored Sep 10, 2021
2 parents 7e2888a + 6e32bcf commit 73fb07b
Show file tree
Hide file tree
Showing 15 changed files with 181 additions and 293 deletions.
4 changes: 2 additions & 2 deletions AvrUartBaud.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
/*********************************************************************************/
#include "AvrUartBaud.h"
/*********************************************************************************/
#if(AVR_UART_BAUD_REVISION_DATE != 20161108)
#if(AVR_UART_BAUD_REVISION_DATE != 20170601)
#error wrong include file. (AvrUartBaud.h)
#endif
/*********************************************************************************/
/** Global variable **/


/*********************************************************************************/
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
Expand Down
15 changes: 9 additions & 6 deletions AvrUartBaud.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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**/
Expand Down Expand Up @@ -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; //
Expand All @@ -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);

/*********************************************************************************/
Expand Down
158 changes: 78 additions & 80 deletions example/AvrUartBaud.dep
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,96 +6,95 @@
<configuration>
<name>Debug</name>
<outputs>
<file>$PROJ_DIR$\main.c</file>
<file>$TOOLKIT_DIR$\inc\bitdefinitions\iom64.inc</file>
<file>$PROJ_DIR$\Debug\Obj\AvrUartBaud.pbi</file>
<file>$TOOLKIT_DIR$\lib\clib\cl3s-ec_mul-sf.r90</file>
<file>$PROJ_DIR$\..\AvrUartBaud.c</file>
<file>$PROJ_DIR$\Debug\Obj\main.r90</file>
<file>$PROJ_DIR$\Debug\Exe\AvrUartBaud.d90</file>
<file>$PROJ_DIR$\Debug\Obj\AvrUartBaud.pbd</file>
<file>$PROJ_DIR$\Debug\Obj\main.pbi</file>
<file>$TOOLKIT_DIR$\inc\comp_a90.h</file>
<file>$TOOLKIT_DIR$\inc\intrinsics.h</file>
<file>$TOOLKIT_DIR$\inc\inavr.h</file>
<file>$PROJ_DIR$\Debug\Obj\AvrUartBaud.r90</file>
<file>$PROJ_DIR$\..\AvrUartBaud.h</file>
<file>$TOOLKIT_DIR$\inc\iom64.h</file>
<file>$TOOLKIT_DIR$\inc\intrinsics.h</file>
<file>$TOOLKIT_DIR$\inc\iomacro.h</file>
<file>$PROJ_DIR$\main.c</file>
<file>$PROJ_DIR$\Debug\Obj\AvrUartBaud.pbd</file>
<file>$PROJ_DIR$\Debug\Obj\AvrUartBaud.r90</file>
<file>$TOOLKIT_DIR$\inc\comp_a90.h</file>
<file>$TOOLKIT_DIR$\config\lnkm64s.xcl</file>
<file>$PROJ_DIR$\Debug\Exe\AvrUartBaud(AT64).d90</file>
<file>$TOOLKIT_DIR$\inc\ina90.h</file>
<file>$TOOLKIT_DIR$\config\lnkm64s.xcl</file>
<file>$TOOLKIT_DIR$\lib\clib\cl3s-ec_mul-sf.r90</file>
<file>$PROJ_DIR$\..\AvrUartBaud.c</file>
<file>$PROJ_DIR$\Debug\Obj\AvrUartBaud.pbi</file>
<file>$TOOLKIT_DIR$\inc\bitdefinitions\iom64.inc</file>
<file>$PROJ_DIR$\Debug\Obj\main.pbi</file>
</outputs>
<file>
<name>[ROOT_NODE]</name>
<outputs>
<tool>
<name>XLINK</name>
<file> 12</file>
<file> 15</file>
</tool>
</outputs>
</file>
<file>
<name>$PROJ_DIR$\main.c</name>
<name>$PROJ_DIR$\..\AvrUartBaud.c</name>
<outputs>
<tool>
<name>BICOMP</name>
<file> 4</file>
<file> 1</file>
</tool>
<tool>
<name>ICCAVR</name>
<file> 1</file>
<file> 12</file>
</tool>
</outputs>
<inputs>
<tool>
<name>BICOMP</name>
<file> 10 11 18 13 7 6 5</file>
<file> 6</file>
</tool>
<tool>
<name>ICCAVR</name>
<file> 10 11 18 13 7 6 5 9</file>
</tool>
</inputs>
</file>
<file>
<name>$PROJ_DIR$\Debug\Obj\AvrUartBaud.pbd</name>
<inputs>
<tool>
<name>BILINK</name>
<file> 17 4</file>
</tool>
</inputs>
</file>
<file>
<name>$PROJ_DIR$\Debug\Exe\AvrUartBaud(AT64).d90</name>
<inputs>
<tool>
<name>XLINK</name>
<file> 14 8 1 15</file>
<file> 6</file>
</tool>
</inputs>
</file>
<file>
<name>$PROJ_DIR$\..\AvrUartBaud.c</name>
<name>$PROJ_DIR$\main.c</name>
<outputs>
<tool>
<name>BICOMP</name>
<file> 17</file>
</tool>
<tool>
<name>ICCAVR</name>
<file> 8</file>
<file> 4</file>
</tool>
</outputs>
<inputs>
<tool>
<name>BICOMP</name>
<file> 9</file>
<file> 7 9 0 16 5 8 13 6</file>
</tool>
<tool>
<name>ICCAVR</name>
<file> 9</file>
<file> 7 9 0 16 5 8 13 6</file>
</tool>
</inputs>
</file>
<file>
<name>$PROJ_DIR$\Debug\Obj\AvrUartBaud.pbd</name>
<inputs>
<tool>
<name>BILINK</name>
<file> 1 17</file>
</tool>
</inputs>
</file>
<file>
<name>$PROJ_DIR$\Debug\Exe\AvrUartBaud(AT64).d90</name>
<inputs>
<tool>
<name>XLINK</name>
<file> 14 12 4 2</file>
</tool>
</inputs>
</file>
Expand All @@ -106,64 +105,49 @@
<configuration>
<name>Release</name>
<outputs>
<file>$PROJ_DIR$\main.c</file>
<file>$PROJ_DIR$\Release\Obj\AvrUartBaud.r90</file>
<file>$PROJ_DIR$\Release\Obj\AvrUartBaud.pbi</file>
<file>$TOOLKIT_DIR$\inc\bitdefinitions\iom64.inc</file>
<file>$PROJ_DIR$\Release\Exe\AvrUartBaud(AT64).hex</file>
<file>$TOOLKIT_DIR$\inc\comp_a90.h</file>
<file>$TOOLKIT_DIR$\inc\intrinsics.h</file>
<file>$PROJ_DIR$\Release\Obj\AvrUartBaud.pbi</file>
<file>$PROJ_DIR$\Release\Obj\AvrUartBaud.pbd</file>
<file>$TOOLKIT_DIR$\lib\clib\cl3s-ec_mul-sf.r90</file>
<file>$PROJ_DIR$\Release\Obj\AvrUartBaud.r90</file>
<file>$PROJ_DIR$\Release\Obj\main.pbi</file>
<file>$PROJ_DIR$\Release\Obj\main.r90</file>
<file>$PROJ_DIR$\..\AvrUartBaud.c</file>
<file>$TOOLKIT_DIR$\inc\inavr.h</file>
<file>$PROJ_DIR$\..\AvrUartBaud.h</file>
<file>$TOOLKIT_DIR$\inc\iom64.h</file>
<file>$TOOLKIT_DIR$\inc\intrinsics.h</file>
<file>$TOOLKIT_DIR$\inc\iomacro.h</file>
<file>$TOOLKIT_DIR$\inc\ina90.h</file>
<file>$PROJ_DIR$\Release\Obj\main.r90</file>
<file>$PROJ_DIR$\main.c</file>
<file>$TOOLKIT_DIR$\inc\comp_a90.h</file>
<file>$TOOLKIT_DIR$\config\lnkm64s.xcl</file>
<file>$PROJ_DIR$\Release\Obj\main.pbi</file>
<file>$TOOLKIT_DIR$\lib\clib\cl3s-ec_mul-sf.r90</file>
<file>$PROJ_DIR$\..\AvrUartBaud.c</file>
<file>$PROJ_DIR$\Release\Obj\AvrUartBaud.pbd</file>
<file>$TOOLKIT_DIR$\inc\bitdefinitions\iom64.inc</file>
<file>$PROJ_DIR$\Release\Exe\AvrUartBaud.hex</file>
<file>$TOOLKIT_DIR$\inc\ina90.h</file>
</outputs>
<file>
<name>[ROOT_NODE]</name>
<outputs>
<tool>
<name>XLINK</name>
<file> 3</file>
<file> 1</file>
</tool>
</outputs>
</file>
<file>
<name>$PROJ_DIR$\main.c</name>
<outputs>
<tool>
<name>BICOMP</name>
<file> 13</file>
</tool>
<tool>
<name>ICCAVR</name>
<file> 11</file>
</tool>
</outputs>
<name>$PROJ_DIR$\Release\Exe\AvrUartBaud(AT64).hex</name>
<inputs>
<tool>
<name>BICOMP</name>
<file> 8 9 17 10 6 5 4</file>
</tool>
<tool>
<name>ICCAVR</name>
<file> 8 9 17 10 6 5 4 7</file>
<name>XLINK</name>
<file> 16 5 7 4</file>
</tool>
</inputs>
</file>
<file>
<name>$PROJ_DIR$\Release\Exe\AvrUartBaud(AT64).hex</name>
<name>$PROJ_DIR$\Release\Obj\AvrUartBaud.pbd</name>
<inputs>
<tool>
<name>XLINK</name>
<file> 12 1 11 14</file>
<name>BILINK</name>
<file> 2 6</file>
</tool>
</inputs>
</file>
Expand All @@ -176,26 +160,40 @@
</tool>
<tool>
<name>ICCAVR</name>
<file> 1</file>
<file> 5</file>
</tool>
</outputs>
<inputs>
<tool>
<name>BICOMP</name>
<file> 7</file>
<file> 10</file>
</tool>
<tool>
<name>ICCAVR</name>
<file> 7</file>
<file> 10</file>
</tool>
</inputs>
</file>
<file>
<name>$PROJ_DIR$\Release\Obj\AvrUartBaud.pbd</name>
<name>$PROJ_DIR$\main.c</name>
<outputs>
<tool>
<name>BICOMP</name>
<file> 6</file>
</tool>
<tool>
<name>ICCAVR</name>
<file> 7</file>
</tool>
</outputs>
<inputs>
<tool>
<name>BILINK</name>
<file> 2 13</file>
<name>BICOMP</name>
<file> 11 13 0 17 9 12 15 10</file>
</tool>
<tool>
<name>ICCAVR</name>
<file> 11 13 0 17 9 12 15 10</file>
</tool>
</inputs>
</file>
Expand Down
Binary file modified example/Debug/Exe/AvrUartBaud(AT64).d90
View file
Binary file not shown.
4 changes: 4 additions & 0 deletions example/Debug/Obj/AvrUartBaud.pbd
View file
Original file line number Diff line number Diff line change
@@ -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
Binary file modified example/Debug/Obj/AvrUartBaud.r90
View file
Binary file not shown.
Binary file modified example/Debug/Obj/main.r90
View file
Binary file not shown.
Loading

0 comments on commit 73fb07b

Please sign in to comment.