forked from M-Labs/artiq
1
0
Fork 0

Merge branch 'master' into phaser2

* master:
  rtio: support differential ttl
  RELEASE_NOTES: int(a, width=b) removal, use int32/64
  pc_rpc: use ProactorEventLoop on Windows (#627)
This commit is contained in:
Robert Jördens 2016-11-24 15:05:49 +01:00
commit 1c84d1ee59
3 changed files with 8 additions and 1 deletions

View File

@ -22,6 +22,7 @@ Release notes
* The Pipistrello port now has exclusively TTLs.
* The DDS class names and setup options have changed, this requires an update of
the device database.
* ``int(a, width=b)`` has been removed. Use ``int32(a)`` and ``int64(a)``.
2.0

View File

@ -107,6 +107,7 @@ class Inout_8X(ttl_serdes_generic.Inout):
self.submodules += serdes
ttl_serdes_generic.Inout.__init__(self, serdes)
class Input_8X(ttl_serdes_generic.Inout):
def __init__(self, pad, pad_n=None):
serdes = _ISERDESE2_8X(pad, pad_n)

View File

@ -11,6 +11,7 @@ client passes a list as a parameter of an RPC method, and that method
client's list.
"""
import os
import socket
import asyncio
import threading
@ -592,7 +593,11 @@ def simple_server_loop(targets, host, port, description=None):
See ``Server`` for a description of the parameters.
"""
loop = asyncio.get_event_loop()
if os.name == "nt":
loop = asyncio.ProactorEventLoop()
asyncio.set_event_loop(loop)
else:
loop = asyncio.get_event_loop()
try:
server = Server(targets, description, True)
loop.run_until_complete(server.start(host, port))