From e170ee1dd323f3f99e154bd5daf026fc8f423465 Mon Sep 17 00:00:00 2001
From: Pacien TRAN-GIRARD
Date: Mon, 16 Jun 2014 00:04:05 +0200
Subject: Refactoring

---
 FPGA/commande/fan.bdf | 376 ++++++++++++++++++++++++++++++--------------------
 1 file changed, 229 insertions(+), 147 deletions(-)

(limited to 'FPGA/commande/fan.bdf')

diff --git a/FPGA/commande/fan.bdf b/FPGA/commande/fan.bdf
index 7a62110..efc37dc 100644
--- a/FPGA/commande/fan.bdf
+++ b/FPGA/commande/fan.bdf
@@ -85,9 +85,9 @@ applicable agreement for further details.
 )
 (pin
 	(output)
-	(rect 664 24 840 40)
+	(rect 56 120 232 136)
 	(text "OUTPUT" (rect 1 0 39 10)(font "Arial" (font_size 6)))
-	(text "fan_auto" (rect 90 0 133 11)(font "Arial" ))
+	(text "speed[1..0]" (rect 90 0 145 11)(font "Arial" ))
 	(pt 0 8)
 	(drawing
 		(line (pt 0 8)(pt 52 8))
@@ -101,9 +101,9 @@ applicable agreement for further details.
 )
 (pin
 	(output)
-	(rect 664 40 840 56)
+	(rect 56 104 232 120)
 	(text "OUTPUT" (rect 1 0 39 10)(font "Arial" (font_size 6)))
-	(text "speed[1..0]" (rect 90 0 145 11)(font "Arial" ))
+	(text "fan_auto" (rect 90 0 133 11)(font "Arial" ))
 	(pt 0 8)
 	(drawing
 		(line (pt 0 8)(pt 52 8))
@@ -116,9 +116,132 @@ applicable agreement for further details.
 	)
 )
 (symbol
-	(rect 368 440 480 528)
+	(rect 376 256 488 304)
+	(text "lpm_constant_00" (rect 7 0 127 16)(font "Arial" (font_size 10)))
+	(text "const0" (rect 8 33 41 44)(font "Arial" ))
+	(port
+		(pt 112 24)
+		(output)
+		(text "result[1..0]" (rect 0 0 59 13)(font "Arial" (font_size 8)))
+		(text "0" (rect 87 18 94 31)(font "Arial" (font_size 8)))
+		(line (pt 112 24)(pt 96 24)(line_width 3))
+	)
+	(drawing
+		(text "2" (rect 99 27 106 38)(font "Arial" ))
+		(line (pt 106 20)(pt 98 28))
+		(line (pt 16 16)(pt 16 32))
+		(line (pt 16 16)(pt 96 16))
+		(line (pt 16 32)(pt 96 32))
+		(line (pt 96 16)(pt 96 32))
+		(line (pt 0 0)(pt 114 0))
+		(line (pt 114 0)(pt 114 50))
+		(line (pt 0 50)(pt 114 50))
+		(line (pt 0 0)(pt 0 50))
+		(line (pt 0 0)(pt 0 0))
+		(line (pt 0 0)(pt 0 0))
+		(line (pt 0 0)(pt 0 0))
+		(line (pt 0 0)(pt 0 0))
+	)
+)
+(symbol
+	(rect 376 192 488 240)
+	(text "lpm_constant_11" (rect 7 0 127 16)(font "Arial" (font_size 10)))
+	(text "const1" (rect 8 33 41 44)(font "Arial" ))
+	(port
+		(pt 112 24)
+		(output)
+		(text "result[1..0]" (rect 0 0 59 13)(font "Arial" (font_size 8)))
+		(text "3" (rect 87 18 94 31)(font "Arial" (font_size 8)))
+		(line (pt 112 24)(pt 96 24)(line_width 3))
+	)
+	(drawing
+		(text "2" (rect 99 27 106 38)(font "Arial" ))
+		(line (pt 106 20)(pt 98 28))
+		(line (pt 16 16)(pt 16 32))
+		(line (pt 16 16)(pt 96 16))
+		(line (pt 16 32)(pt 96 32))
+		(line (pt 96 16)(pt 96 32))
+		(line (pt 0 0)(pt 114 0))
+		(line (pt 114 0)(pt 114 50))
+		(line (pt 0 50)(pt 114 50))
+		(line (pt 0 0)(pt 0 50))
+		(line (pt 0 0)(pt 0 0))
+		(line (pt 0 0)(pt 0 0))
+		(line (pt 0 0)(pt 0 0))
+		(line (pt 0 0)(pt 0 0))
+	)
+)
+(symbol
+	(rect 368 -16 496 80)
+	(text "lpm_compare_00" (rect 13 0 134 16)(font "Arial" (font_size 10)))
+	(text "compare00" (rect 8 81 63 92)(font "Arial" ))
+	(port
+		(pt 0 48)
+		(input)
+		(text "dataa[1..0]" (rect 0 0 60 13)(font "Arial" (font_size 8)))
+		(text "dataa[1..0]" (rect 20 42 80 55)(font "Arial" (font_size 8)))
+		(line (pt 0 48)(pt 16 48)(line_width 3))
+	)
+	(port
+		(pt 128 56)
+		(output)
+		(text "aeb" (rect 0 0 21 13)(font "Arial" (font_size 8)))
+		(text "aeb" (rect 91 50 112 63)(font "Arial" (font_size 8)))
+		(line (pt 128 56)(pt 112 56))
+	)
+	(drawing
+		(text "datab[]=0" (rect 20 58 73 71)(font "Arial" (font_size 8)))
+		(text "compare" (rect 76 27 119 38)(font "Arial" ))
+		(line (pt 16 16)(pt 16 80))
+		(line (pt 16 16)(pt 112 16))
+		(line (pt 16 80)(pt 112 80))
+		(line (pt 112 16)(pt 112 80))
+		(line (pt 0 0)(pt 129 0))
+		(line (pt 129 0)(pt 129 98))
+		(line (pt 0 98)(pt 129 98))
+		(line (pt 0 0)(pt 0 98))
+		(line (pt 0 0)(pt 0 0))
+		(line (pt 0 0)(pt 0 0))
+		(line (pt 0 0)(pt 0 0))
+		(line (pt 0 0)(pt 0 0))
+	)
+)
+(symbol
+	(rect 400 112 464 160)
+	(text "AND2" (rect 1 0 28 10)(font "Arial" (font_size 6)))
+	(text "and_f" (rect 3 37 31 48)(font "Arial" ))
+	(port
+		(pt 0 16)
+		(input)
+		(text "IN1" (rect 2 7 22 18)(font "Courier New" (bold))(invisible))
+		(text "IN1" (rect 2 7 22 18)(font "Courier New" (bold))(invisible))
+		(line (pt 0 16)(pt 14 16))
+	)
+	(port
+		(pt 0 32)
+		(input)
+		(text "IN2" (rect 2 23 22 34)(font "Courier New" (bold))(invisible))
+		(text "IN2" (rect 2 23 22 34)(font "Courier New" (bold))(invisible))
+		(line (pt 0 32)(pt 14 32))
+	)
+	(port
+		(pt 64 24)
+		(output)
+		(text "OUT" (rect 48 15 68 26)(font "Courier New" (bold))(invisible))
+		(text "OUT" (rect 48 15 68 26)(font "Courier New" (bold))(invisible))
+		(line (pt 42 24)(pt 64 24))
+	)
+	(drawing
+		(line (pt 14 12)(pt 30 12))
+		(line (pt 14 37)(pt 31 37))
+		(line (pt 14 12)(pt 14 37))
+		(arc (pt 31 37)(pt 30 12)(rect 18 12 43 37))
+	)
+)
+(symbol
+	(rect 664 88 776 176)
 	(text "BUSMUX" (rect 28 0 95 16)(font "Arial" (font_size 10)))
-	(text "inst1" (rect 3 77 26 88)(font "Arial" ))
+	(text "mux_auto" (rect 3 77 51 88)(font "Arial" ))
 	(port
 		(pt 0 64)
 		(input)
@@ -161,12 +284,12 @@ applicable agreement for further details.
 		(line (pt 44 16)(pt 68 32))
 		(line (pt 44 80)(pt 68 64))
 	)
-	(annotation_block (parameter)(rect 480 408 600 434))
+	(annotation_block (parameter)(rect 776 56 896 82))
 )
 (symbol
-	(rect 368 256 480 344)
+	(rect 664 272 776 360)
 	(text "BUSMUX" (rect 28 0 95 16)(font "Arial" (font_size 10)))
-	(text "inst3" (rect 3 77 26 88)(font "Arial" ))
+	(text "mux_ena" (rect 3 77 49 88)(font "Arial" ))
 	(port
 		(pt 0 64)
 		(input)
@@ -209,201 +332,160 @@ applicable agreement for further details.
 		(line (pt 44 16)(pt 68 32))
 		(line (pt 44 80)(pt 68 64))
 	)
-	(annotation_block (parameter)(rect 480 224 600 250))
-)
-(symbol
-	(rect 392 208 424 240)
-	(text "GND" (rect 8 16 29 26)(font "Arial" (font_size 6)))
-	(text "inst" (rect 3 21 20 32)(font "Arial" )(invisible))
-	(port
-		(pt 16 0)
-		(output)
-		(text "1" (rect 18 0 25 11)(font "Courier New" (bold))(invisible))
-		(text "1" (rect 18 0 25 11)(font "Courier New" (bold))(invisible))
-		(line (pt 16 8)(pt 16 0))
-	)
-	(drawing
-		(line (pt 8 8)(pt 16 16))
-		(line (pt 16 16)(pt 24 8))
-		(line (pt 8 8)(pt 24 8))
-	)
+	(annotation_block (parameter)(rect 776 240 896 266))
 )
 (symbol
-	(rect 384 32 432 64)
-	(text "WIRE" (rect 1 0 25 10)(font "Arial" (font_size 6)))
-	(text "inst4" (rect 3 21 26 32)(font "Arial" ))
+	(rect 664 -96 776 -8)
+	(text "BUSMUX" (rect 28 0 95 16)(font "Arial" (font_size 10)))
+	(text "mux_auto10" (rect 3 77 64 88)(font "Arial" ))
 	(port
-		(pt 0 16)
+		(pt 0 64)
 		(input)
-		(text "IN" (rect 2 7 16 18)(font "Courier New" (bold))(invisible))
-		(text "IN" (rect 2 7 16 18)(font "Courier New" (bold))(invisible))
-		(line (pt 0 16)(pt 14 16))
-	)
-	(port
-		(pt 48 16)
-		(output)
-		(text "OUT" (rect 32 7 52 18)(font "Courier New" (bold))(invisible))
-		(text "OUT" (rect 32 7 52 18)(font "Courier New" (bold))(invisible))
-		(line (pt 32 16)(pt 48 16))
-	)
-	(drawing
-		(line (pt 14 7)(pt 32 16))
-		(line (pt 14 25)(pt 14 7))
-		(line (pt 14 25)(pt 32 16))
+		(text "datab[WIDTH-1..0]" (rect 6 51 111 64)(font "Arial" (font_size 8)))
+		(text "datab[]" (rect 6 51 44 64)(font "Arial" (font_size 8)))
+		(line (pt 0 64)(pt 44 64)(line_width 3))
 	)
-)
-(symbol
-	(rect 384 80 432 112)
-	(text "WIRE" (rect 1 0 25 10)(font "Arial" (font_size 6)))
-	(text "inst5" (rect 3 21 26 32)(font "Arial" ))
 	(port
-		(pt 0 16)
+		(pt 56 88)
 		(input)
-		(text "IN" (rect 2 7 16 18)(font "Courier New" (bold))(invisible))
-		(text "IN" (rect 2 7 16 18)(font "Courier New" (bold))(invisible))
-		(line (pt 0 16)(pt 14 16))
-	)
-	(port
-		(pt 48 16)
-		(output)
-		(text "OUT" (rect 32 7 52 18)(font "Courier New" (bold))(invisible))
-		(text "OUT" (rect 32 7 52 18)(font "Courier New" (bold))(invisible))
-		(line (pt 32 16)(pt 48 16))
-	)
-	(drawing
-		(line (pt 14 7)(pt 32 16))
-		(line (pt 14 25)(pt 14 7))
-		(line (pt 14 25)(pt 32 16))
+		(text "sel" (rect 59 70 75 83)(font "Arial" (font_size 8)))
+		(text "sel" (rect 59 70 75 83)(font "Arial" (font_size 8)))
+		(line (pt 56 88)(pt 56 72))
 	)
-)
-(symbol
-	(rect 384 112 432 144)
-	(text "WIRE" (rect 1 0 25 10)(font "Arial" (font_size 6)))
-	(text "inst6" (rect 3 21 26 32)(font "Arial" ))
 	(port
-		(pt 0 16)
+		(pt 0 32)
 		(input)
-		(text "IN" (rect 2 7 16 18)(font "Courier New" (bold))(invisible))
-		(text "IN" (rect 2 7 16 18)(font "Courier New" (bold))(invisible))
-		(line (pt 0 16)(pt 14 16))
+		(text "dataa[WIDTH-1..0]" (rect 6 19 111 32)(font "Arial" (font_size 8)))
+		(text "dataa[]" (rect 6 19 44 32)(font "Arial" (font_size 8)))
+		(line (pt 0 32)(pt 44 32)(line_width 3))
 	)
 	(port
-		(pt 48 16)
+		(pt 112 48)
 		(output)
-		(text "OUT" (rect 32 7 52 18)(font "Courier New" (bold))(invisible))
-		(text "OUT" (rect 32 7 52 18)(font "Courier New" (bold))(invisible))
-		(line (pt 32 16)(pt 48 16))
+		(text "result[WIDTH-1..0]" (rect 75 35 180 48)(font "Arial" (font_size 8)))
+		(text "result[]" (rect 75 35 112 48)(font "Arial" (font_size 8)))
+		(line (pt 68 48)(pt 112 48)(line_width 3))
+	)
+	(parameter
+		"WIDTH"
+		"2"
+		"Width of I/O, any integer > 0"
+		" 1" " 2" " 3" " 4" " 5" " 6" " 7" " 8" " 9" "10" "11" "12" "13" "14" "15" "16" "20" "24" "28" "32" "40" "48" "56" "64" 
 	)
 	(drawing
-		(line (pt 14 7)(pt 32 16))
-		(line (pt 14 25)(pt 14 7))
-		(line (pt 14 25)(pt 32 16))
+		(text "0" (rect 52 31 59 41)(font "Arial" (font_size 6)))
+		(text "1" (rect 52 55 57 65)(font "Arial" (font_size 6)))
+		(line (pt 68 64)(pt 68 32))
+		(line (pt 44 80)(pt 44 16))
+		(line (pt 44 16)(pt 68 32))
+		(line (pt 44 80)(pt 68 64))
 	)
+	(annotation_block (parameter)(rect 776 -128 896 -102))
 )
 (connector
-	(text "fan_auto_user" (rect 312 32 383 43)(font "Arial" ))
-	(pt 384 48)
-	(pt 304 48)
-)
-(connector
-	(text "fan_auto" (rect 448 32 491 43)(font "Arial" ))
-	(pt 432 48)
-	(pt 448 48)
+	(text "no_manual" (rect 505 24 560 35)(font "Arial" ))
+	(pt 496 40)
+	(pt 560 40)
 )
 (connector
-	(pt 384 128)
-	(pt 368 128)
-)
-(connector
-	(pt 384 96)
-	(pt 368 96)
+	(text "fan_speed[1..0]" (rect 296 16 372 27)(font "Arial" ))
+	(pt 368 32)
+	(pt 288 32)
+	(bus)
 )
 (connector
-	(text "hot" (rect 312 96 327 107)(font "Arial" ))
-	(pt 304 112)
-	(pt 368 112)
+	(text "fan_speed[1..0]" (rect 584 104 660 115)(font "Arial" ))
+	(pt 584 120)
+	(pt 664 120)
+	(bus)
 )
 (connector
-	(pt 368 96)
-	(pt 368 112)
+	(text "fan_value[1..0]" (rect 586 320 659 331)(font "Arial" ))
+	(pt 664 336)
+	(pt 584 336)
+	(bus)
 )
 (connector
-	(pt 368 112)
-	(pt 368 128)
+	(text "fan_off[1..0]" (rect 583 288 642 299)(font "Arial" ))
+	(pt 664 304)
+	(pt 584 304)
+	(bus)
 )
 (connector
-	(text "fan_hot[1]" (rect 442 80 491 91)(font "Arial" ))
-	(pt 432 96)
-	(pt 448 96)
+	(text "enable" (rect 704 364 715 397)(font "Arial" )(vertical))
+	(pt 720 360)
+	(pt 720 408)
 )
 (connector
-	(text "fan_hot[0]" (rect 440 112 489 123)(font "Arial" ))
-	(pt 432 128)
-	(pt 448 128)
+	(text "speed[1..0]" (rect 792 304 847 315)(font "Arial" ))
+	(pt 776 320)
+	(pt 792 320)
+	(bus)
 )
 (connector
-	(text "fan_speed[1..0]" (rect 296 272 372 283)(font "Arial" ))
-	(pt 288 288)
-	(pt 368 288)
+	(text "fan_value[1..0]" (rect 791 120 864 131)(font "Arial" ))
+	(pt 776 136)
+	(pt 792 136)
 	(bus)
 )
 (connector
-	(text "fan_value[1..0]" (rect 298 488 371 499)(font "Arial" ))
-	(pt 368 504)
-	(pt 288 504)
-	(bus)
+	(text "fan_auto" (rect 704 179 715 222)(font "Arial" )(vertical))
+	(pt 720 224)
+	(pt 720 176)
 )
 (connector
-	(text "fan_off[1..0]" (rect 295 456 354 467)(font "Arial" ))
-	(pt 368 472)
-	(pt 288 472)
+	(text "fan_on[1..0]" (rect 582 -48 641 -37)(font "Arial" ))
+	(pt 584 -32)
+	(pt 664 -32)
 	(bus)
 )
 (connector
-	(text "enable" (rect 408 532 419 565)(font "Arial" )(vertical))
-	(pt 424 528)
-	(pt 424 576)
+	(text "hot" (rect 704 19 715 34)(font "Arial" )(vertical))
+	(pt 720 40)
+	(pt 720 -8)
 )
 (connector
-	(text "speed[1..0]" (rect 496 472 551 483)(font "Arial" ))
-	(pt 480 488)
-	(pt 496 488)
+	(text "fan_auto_value[1..0]" (rect 582 136 682 147)(font "Arial" ))
+	(pt 584 152)
+	(pt 664 152)
 	(bus)
 )
 (connector
-	(text "fan_value[1..0]" (rect 495 288 568 299)(font "Arial" ))
-	(pt 480 304)
-	(pt 496 304)
+	(text "fan_auto_value[1..0]" (rect 791 -64 891 -53)(font "Arial" ))
+	(pt 776 -48)
+	(pt 792 -48)
 	(bus)
 )
 (connector
-	(text "fan_off[0]" (rect 424 176 470 187)(font "Arial" ))
-	(pt 408 192)
-	(pt 424 192)
+	(text "fan_off[1..0]" (rect 583 -80 642 -69)(font "Arial" ))
+	(pt 664 -64)
+	(pt 584 -64)
+	(bus)
 )
 (connector
-	(text "fan_off[1]" (rect 419 160 465 171)(font "Arial" ))
-	(pt 408 176)
-	(pt 424 176)
+	(text "fan_on[1..0]" (rect 496 200 555 211)(font "Arial" ))
+	(pt 520 216)
+	(pt 488 216)
+	(bus)
 )
 (connector
-	(text "fan_hot[1..0]" (rect 296 304 357 315)(font "Arial" ))
-	(pt 288 320)
-	(pt 368 320)
+	(text "fan_off[1..0]" (rect 496 264 555 275)(font "Arial" ))
+	(pt 488 280)
+	(pt 520 280)
 	(bus)
 )
 (connector
-	(pt 408 176)
-	(pt 408 192)
+	(text "fan_auto" (rect 480 120 523 131)(font "Arial" ))
+	(pt 496 136)
+	(pt 464 136)
 )
 (connector
-	(pt 408 192)
-	(pt 408 208)
+	(text "fan_auto_user" (rect 328 112 399 123)(font "Arial" ))
+	(pt 400 128)
+	(pt 320 128)
 )
 (connector
-	(text "fan_auto_user" (rect 408 339 419 410)(font "Arial" )(vertical))
-	(pt 424 344)
-	(pt 424 416)
+	(text "no_manual" (rect 328 128 383 139)(font "Arial" ))
+	(pt 400 144)
+	(pt 320 144)
 )
-(junction (pt 368 112))
-(junction (pt 408 192))
-- 
cgit v1.2.3