From f4ef9cf935189d0c5750c19dd64f38adf4570242 Mon Sep 17 00:00:00 2001
From: Seungsu Lim <smkongdo@gmail.com>
Date: Tue, 14 May 2019 19:30:15 +0900
Subject: [PATCH] =?UTF-8?q?MAC=20=ED=85=8C=EC=9D=B4=EB=B8=94=20=EA=B4=80?=
 =?UTF-8?q?=EB=A0=A8=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Drivers/INTEG_MAC/Src/integ_mac.c | 29 -----------------------------
 1 file changed, 29 deletions(-)

diff --git a/Drivers/INTEG_MAC/Src/integ_mac.c b/Drivers/INTEG_MAC/Src/integ_mac.c
index 9860e0c..f4e4e10 100644
--- a/Drivers/INTEG_MAC/Src/integ_mac.c
+++ b/Drivers/INTEG_MAC/Src/integ_mac.c
@@ -91,14 +91,12 @@ void integ_mac_handler(void * arg)
       if(frame_state == TRANSMIT_FRAME) {
         cur_media = frame->media_type;
         
-        
         // ������ �������� ��� ������ ��ü�� ����
         if((cur_media & OPT_MEDIA) == OPT_MEDIA) {
           prev_media = cur_media & 0x0F;
           
           // ackNumber �ʵ� �� �������� Ƚ���� ����Ѵ�. (�ӽ�)
           frame->ackNumber++;
-<<<<<<< HEAD
           
           // ������ ��⿭�� ������ �߰�
           re_frame_queue_insert((unsigned char *)frame);
@@ -115,23 +113,6 @@ void integ_mac_handler(void * arg)
           }
           frame->media_type = OPT_MEDIA | cur_media;
           
-=======
-          
-          cur_media = prev_media;
-          // ������ Ƚ���� 3ȸ�̸� ��ü ���� ���� �������� ����
-          if(frame->ackNumber >= RETRANSMIT_NUM) {
-            // ���� ���� ��ü ���� ���� ����
-            STATUS_TABLE[CONNECT_STATUS][prev_media] = DISCON;
-            integ_find_opt_link(NULL);
-            cur_media = opt_media;
-          }
-          frame->media_type = OPT_MEDIA | cur_media;
-          
-          // ������ ��⿭�� ������ �߰�
-          re_frame_queue_insert((unsigned char *)frame);
-          sprintf(message_buffer, "* [%s] %d �� ������ ���� ���� \r\n", media_name[prev_media], frame->ackNumber);
-          insert_display_message(message_buffer);
->>>>>>> 9a8baaaeeed4b1f29561da2649734bab490f5100
           
           if(prev_media != cur_media) {
             //sprintf(message_buffer, "* [INTEG][%s] ���� [%s] ���� ��ü ���� \r\n",  media_name[prev_media],  media_name[cur_media]);
@@ -459,11 +440,7 @@ void integ_find_opt_link(void * arg)
   // �ֱ����� TASK ����
   task.fun = integ_find_opt_link;
   strcpy(task.arg, "");
-<<<<<<< HEAD
   //insert_timer(&task, FIND_OPT_PERIOD);
-=======
-  insert_timer(&task, FIND_OPT_PERIOD);
->>>>>>> 9a8baaaeeed4b1f29561da2649734bab490f5100
   
   for(i = 0; i < MEDIA_NUM; i++) {
     if(STATUS_TABLE[INIT_STATUS][i] && STATUS_TABLE[CONNECT_STATUS][i]) {
@@ -472,7 +449,6 @@ void integ_find_opt_link(void * arg)
       //printf("������ü : %s\r\n", media_name[opt_media]);
     }
   }
-<<<<<<< HEAD
   
   // ����� ��ü�� ���� ���
   if(i == MEDIA_NUM) {
@@ -491,11 +467,6 @@ void integ_find_opt_link(void * arg)
   else {
     
   }
-=======
-  //opt_media = (rand() % 2) + 1;
-  opt_media = (opt_media + 1) % 2 + 1;
-  
->>>>>>> 9a8baaaeeed4b1f29561da2649734bab490f5100
   
 }